- Devel - libvirt List Archives

[libvirt] [PATCH libvirt 1/6] errcode is typedef by mingw, rename an argument name
by Marc-André Lureau 10 Feb '12

10 Feb '12

Fixes the following warning: util/virterror.c:1242:31: warning: declaration of 'errcode' shadows a global declaration [-Wshadow] --- src/util/virterror.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virterror.c b/src/util/virterror.c index ff44a57..85eec8d 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1228,7 +1228,7 @@ virErrorMsg(virErrorNumber error, const char *info) * virReportErrorHelper: * * @domcode: the virErrorDomain indicating where it's coming from - * @errcode: the virErrorNumber code for the error + * @errorcode: the virErrorNumber code for the error * @filename: Source file error is dispatched from * @funcname: Function error is dispatched from * @linenr: Line number error is dispatched from @@ -1239,7 +1239,7 @@ virErrorMsg(virErrorNumber error, const char *info) * ReportError */ void virReportErrorHelper(int domcode, - int errcode, + int errorcode, const char *filename, const char *funcname, size_t linenr, @@ -1258,9 +1258,9 @@ void virReportErrorHelper(int domcode, errorMessage[0] = '\0'; } - virerr = virErrorMsg(errcode, (errorMessage[0] ? errorMessage : NULL)); + virerr = virErrorMsg(errorcode, (errorMessage[0] ? errorMessage : NULL)); virRaiseErrorFull(filename, funcname, linenr, - domcode, errcode, VIR_ERR_ERROR, + domcode, errorcode, VIR_ERR_ERROR, virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); errno = save_errno; -- 1.7.7.5

4 30

[libvirt] RFC: PCI-Passthrough of SRIOV VF's new forward mode
by Shradha Shah 10 Feb '12

10 Feb '12

RFC: New network forward type pci-passthrough-hybrid I saw a couple of posts regarding PCI-Passthrough usage of SRIOV VF's a couple of weeks ago (20th Jan 2012). Initially I was going to post this RFC along with a set of patches. I would require a few more days to clean my patches for submission and hence I would start with an RFC on a new method to manage PCI-Passthrough of SRIOV VF's. I work for Solarflare Communications who make 10G network adapters. We currently have SRIOV capable adapters available and in production and we would like to work with upstream libvirt to develop the required support for our hardware. This RFC introduces a new network forward mode to libvirt called pci-passthrough-hybrid and provides a solution for migration with PCI-Passthrough as well as providing significant increase in the networking performance. The Solarflare SRIOV driver architecture for KVM is explained in the Release notes which can be found here: https://support.solarflare.com/index.php?view=categories&id=1813&option=com… This is a working model and currently available to Solarflare Customers for evaluation. The hybrid model of the SRIOV driver provided by Solarflare currently achieves the highest SPECvirt performance in the market. Solarflare Ethernet card supports 127 VF's on each port. The MAC address of each unused VF is 00:00:00:00:00:00 by default. Hence the MAC address of the VF does not change on every reboot. There is no VF driver on the host. Each VF does not correspond to an Ethernet device. Instead, VF's are managed using the PCI sysfs files. With the pci-passthrough-hybrid model when the VF is passed into the guest, it appears in the guest as a PCI device and not as a network device. A virtual network device in the form of a virtio interface is also present in the guest. The virtio device in the guest comes from either bridging the physical network device or by creating a macvtap interface of type (vepa, private, bridge) on the physical network device. The virtio device and the VF bind together in the guest to create an accelerated and a non-accelerated path. The new method I wish to propose, uses implicit pci-passthrough and there is no need to provide an explicit <hostdev> element in the domain xml. The hostdev would be added to the live xml as non-persistent as suggested by Laine Stump in a previous post, link to which can be found at: https://www.redhat.com/archives/libvir-list/2011-August/msg00937.html 1) In order to support the above mentioned hybrid model, the requirement is that the VF needs to be assigned the same MAC address as the virtio device in the guest. This enables the VF and the virtio device to bind successfully using the Solarflare driver called XNAP. Effectively we do not need to extend the <hostdev> schema. This can be taken care of by the <interface> element. Along with the MAC address the VLAN tags can also be taken care of by the <interface>/<network> elements. 2) The VF appears in the guest as a PCI device hence the MAC address of the VF is stored in the sysfs files. Assigning the MAC address to the VF before or after pci passthough is not an issue. Proposed steps to support the hybrid model of pci-passthrough in libvirt: 1) <network> will have a new forward type='pci-passthroug-hybrid'. When forward type='pci-passthrough-hybrid' instead of a pool of Ethernet interfaces a <pf> element will need to be specified for implicit VF allocation as shown in the example below: <network> <name>direct-network</name> <forward mode="pci-passthrough-hybrid"> <pf dev="eth2"/> </forward> </network> 2) In the domain's <interface> definition, when type='network' and if network has forward type='pci-passthrough-hybrid', the domain code will request an unused VF from the physical device. Example: <interface type='network'> <source network='direct-network'/> <mac address='00:50:56:0f:86:3b'/> <model type='virtio'/> <actual type='direct'> <source mode='pci-passthrough-hybrid'/> </actual> </interface> 3) The code will then use the NodeDevice API to learn all the necessary PCI domain/slot/bus/function information. 4) Before starting the guest the VF's PCI device name (0000:04:00.2) will be saved in interface/actual so that it can be easily retrieved if libvirtd is restarted. 5) While building the qemu command line, if a network device has forward mode='pci-passthrough-hybrid', the code will add a (non-persisting) <hostdev> element to the qemu command line. This <hostdev> will be marked as ephemeral before passing it to the guest. Ephemeral=transient. 6) During the process of network connection the MAC address of the VF will be set according to the domain <interface> config. This step can also involve setting the VLAN tag, port profiles, etc. 7) Follwoing the above steps the guest will then start with implicit PCI-Passthough of a SRIOV VF. 8) When the guest is eventually destroyed, the Ethernet device will be free'd back to the network pool for use by another guest. Since the MAC address needs to be reset to 00:00:00:00:00:00 we do not need any reference to the higher level device definition. Since the VF is transient, it will be removed when the guest is shutdown and hotplugged again, by the libvirt API, when the guest is started. Hence, in order to get a list of hostdevs attached to a guest we only ever have to look at the <hostdev> element. One of the objections that had been raised following Mr Stump's post was that a transient hostdev will not ensure that the guest PCI address does not get changed each time the guest is run, but since the VF is a pci device in the guest and does not bind to specific driver, we can work with this proposed solution. Migration is possible using the above method without any explicit effort from the user in the following way: 1) Begin stage: All the ephemeral devices do not make their way into the xml that is passed to the destination. 2) Prepare stage: Replacement VF's on the destination, if present, will be automatically reserved and plugged in the guest by the networking code. 3) Perform stage: Any ephemeral device are removed from the guest by libvirt. 4) Confirm stage: If migration fails the VF's will be restored else the VF's will be free's back to the networking pool by the networking code. I have been working on the patches for the above mentioned method and would like to know your take on the hybrid model.

2 3

[libvirt] [PATCH 0/3] Introduce virDomainPMWakeup API
by Michal Privoznik 10 Feb '12

10 Feb '12

This is counterpart for virDomainPMSuspendForDuration API which we have already in. It allows user to wake up guest from S3 state. Michal Privoznik (3): Introduce virDomainPMWakeup API virsh: Expose virDomainPMWakeup qemu: Implement virDomainPMWakeup API include/libvirt/libvirt.h.in | 2 + src/driver.h | 4 +++ src/libvirt.c | 50 ++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_driver.c | 54 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 20 +++++++++++++++ src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 21 ++++++++++++++++ src/qemu/qemu_monitor_json.h | 2 + src/qemu/qemu_monitor_text.c | 26 ++++++++++++++++++++ src/qemu/qemu_monitor_text.h | 2 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 8 +++++- src/remote_protocol-structs | 5 ++++ tools/virsh.c | 46 +++++++++++++++++++++++++++++++++++ 15 files changed, 243 insertions(+), 1 deletions(-) -- 1.7.3.4

2 7

[libvirt] [PATCH v5] npiv: Auto-generate WWN if it's not specified
by Osier Yang 10 Feb '12

10 Feb '12

The auto-generated WWN comply with the new addressing schema of WWN: <quote> the first nibble is either hex 5 or 6 followed by a 3-byte vendor identifier and 36 bits for a vendor-specified serial number. </quote> We choose hex 5 for the first nibble. And use Qumranet's OUI (00:1A:4A) as the 3-byte vendor indentifier. The last 36 bits are auto-generated. --- src/conf/node_device_conf.c | 36 +++++++++++++++++++----------------- src/libvirt_private.syms | 1 + src/util/virrandom.c | 18 ++++++++++++++++++ src/util/virrandom.h | 1 + 4 files changed, 39 insertions(+), 17 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index d9dc9ac..127a4ae 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -37,6 +37,7 @@ #include "buf.h" #include "uuid.h" #include "pci.h" +#include "virrandom.h" #define VIR_FROM_THIS VIR_FROM_NODEDEV @@ -63,19 +64,12 @@ VIR_ENUM_IMPL(virNodeDevHBACap, VIR_NODE_DEV_CAP_HBA_LAST, static int virNodeDevCapsDefParseString(const char *xpath, xmlXPathContextPtr ctxt, - char **string, - virNodeDeviceDefPtr def, - const char *missing_error_fmt) + char **string) { char *s; - s = virXPathString(xpath, ctxt); - if (s == NULL) { - virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, - missing_error_fmt, - def->name); + if (!(s = virXPathString(xpath, ctxt))) return -1; - } *string = s; return 0; @@ -763,18 +757,26 @@ virNodeDevCapScsiHostParseXML(xmlXPathContextPtr ctxt, if (virNodeDevCapsDefParseString("string(./wwnn[1])", ctxt, - &data->scsi_host.wwnn, - def, - _("no WWNN supplied for '%s'")) < 0) { - goto out; + &data->scsi_host.wwnn) < 0) { + if (virRandomGenerateWWN(&data->scsi_host.wwnn) < 0) { + virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, + _("no WWNN supplied for '%s', and " + "auto-generation failed"), + def->name); + goto out; + } } if (virNodeDevCapsDefParseString("string(./wwpn[1])", ctxt, - &data->scsi_host.wwpn, - def, - _("no WWPN supplied for '%s'")) < 0) { - goto out; + &data->scsi_host.wwpn) < 0) { + if (virRandomGenerateWWN(&data->scsi_host.wwpn) < 0) { + virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, + _("no WWPN supplied for '%s', and " + "auto-generation failed"), + def->name); + goto out; + } } ctxt->node = orignode2; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d6ad36c..421986b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1373,6 +1373,7 @@ virPidFileDeletePath; # virrandom.h virRandomBits; +virRandomGenerateWWN; virRandomInitialize; diff --git a/src/util/virrandom.c b/src/util/virrandom.c index ec0cf03..3116275 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -22,10 +22,15 @@ #include <config.h> #include <stdlib.h> +#include <inttypes.h> #include "virrandom.h" #include "threads.h" #include "count-one-bits.h" +#include "util.h" +#include "virterror_internal.h" + +#define VIR_FROM_THIS VIR_FROM_NONE static char randomState[128]; static struct random_data randomData; @@ -79,3 +84,16 @@ uint64_t virRandomBits(int nbits) virMutexUnlock(&randomLock); return ret; } + +#define QUMRANET_OUI "001a4a" + +int +virRandomGenerateWWN(char **wwn) { + if (virAsprintf(wwn, "5" QUMRANET_OUI "%09" PRIx64, + virRandomBits(36)) < 0) { + virReportOOMError(); + return -1; + } + + return 0; +} diff --git a/src/util/virrandom.h b/src/util/virrandom.h index e180a2f..443451e 100644 --- a/src/util/virrandom.h +++ b/src/util/virrandom.h @@ -27,5 +27,6 @@ int virRandomInitialize(uint32_t seed) ATTRIBUTE_RETURN_CHECK; uint64_t virRandomBits(int nbits); +int virRandomGenerateWWN(char **wwn); #endif /* __VIR_RANDOM_H__ */ -- 1.7.7.3

4 14

[libvirt] QEMU applying for Google Summer of Code 2012
by Stefan Hajnoczi 10 Feb '12

10 Feb '12

This year's Google Summer of Code has been announced: http://www.google-melange.com/gsoc/events/google/gsoc2012 For those who haven't heard of GSoC before, it funds university students to work on open source projects during the summer. Organizations, such as QEMU, can participate to attract students who will tackle projects for 12 weeks this summer. The GSoC program has been very successful because it gives students real open source experience and organizations can grow their development community. QEMU has participated for several years and I would like to organize our participation this year. Luiz was QEMU organization administrator last year and contacted me because he will not have time this year. I will prepare the application form for QEMU so that we will be considered for 2012. Umbrella organization --------------------- Like last year, we can provide a home for KVM kernel module and libvirt projects too if those organizations prefer not to apply to GSoC themselves. Please let us know so we can work together! Ideas list ---------- The starting point for student candidates is our "Ideas List". I have created a new page for this year - please add project ideas that you'd like students to work on: http://wiki.qemu.org/Google_Summer_of_Code_2012 Here is last year's list: http://wiki.qemu.org/Google_Summer_of_Code_2011 A GSoC project should be achievable in 12 weeks by someone who is competent in C programming but does not have prior QEMU coding experience. Students normally work full-time (5 days per week). Please also indicate if you are willing to mentor a student for your project idea. I have provided a wiki template on the page so you can easily add project ideas. Mentors needed -------------- Each student that we accept needs a mentor. Mentors are QEMU developers who are willing to answer questions, review code, give advice, and evaluate the student's progress. This is a time commitment but also a good experience that I have enjoyed and would recommend. Timeline -------- Please add project ideas to the wiki now: http://wiki.qemu.org/Google_Summer_of_Code_2012 Feb 27 - Mar 9: I will submit QEMU's application form Mar 17 - Apr 20: Mentors respond to student candidates, interview them, and select the best candidate May 21 - Aug 20: Students work on their projects Please let me know if you have any questions or suggestions! Stefan

2 2

[libvirt] [PATCH libvirt] domain: add implicit USB controller
by Marc-André Lureau 10 Feb '12

10 Feb '12

Some tools, such as virt-manager, prefers having the default USB controller explicit in the XML document. This patch makes sure there is one. With this patch, it is now possible to switch from USB1 to USB2 from the release 0.9.1 of virt-manager. Fix tests to pass with this change. --- src/conf/domain_conf.c | 93 ++++++++++--------- src/qemu/qemu_command.c | 8 ++- tests/define-dev-segfault | 1 + tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 1 + tests/domainsnapshotxml2xmlout/full_domain.xml | 1 + tests/domainsnapshotxml2xmlout/metadata.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-bios.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 1 + .../qemuxml2argv-blkiotune-device.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 1 + .../qemuxml2argv-boot-complex-bootindex.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-boot-complex.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 1 + ...uxml2argv-boot-menu-disable-drive-bootindex.xml | 1 + .../qemuxml2argv-boot-menu-disable-drive.xml | 1 + .../qemuxml2argv-boot-menu-disable.xml | 1 + .../qemuxml2argv-boot-menu-enable.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-boot-network.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml | 1 + .../qemuxml2argv-channel-guestfwd.xml | 1 + .../qemuxml2argv-channel-spicevmc-old.xml | 1 + .../qemuxml2argv-channel-spicevmc.xml | 1 + .../qemuxml2argv-channel-virtio-auto.xml | 1 + .../qemuxml2argv-channel-virtio.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-clock-france.xml | 1 + .../qemuxml2argv-clock-localtime.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 1 + .../qemuxml2argv-clock-variable.xml | 1 + .../qemuxml2argv-console-compat-auto.xml | 1 + .../qemuxml2argv-console-compat-chardev.xml | 1 + .../qemuxml2argv-console-compat.xml | 1 + .../qemuxml2argv-console-virtio-many.xml | 1 + .../qemuxml2argv-console-virtio.xml | 1 + .../qemuxml2argv-cpu-host-kvmclock.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml | 1 + .../qemuxml2argv-disk-cdrom-empty.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 1 + .../qemuxml2argv-disk-copy_on_read.xml | 1 + .../qemuxml2argv-disk-drive-boot-cdrom.xml | 1 + .../qemuxml2argv-disk-drive-boot-disk.xml | 1 + .../qemuxml2argv-disk-drive-cache-directsync.xml | 1 + .../qemuxml2argv-disk-drive-cache-unsafe.xml | 1 + .../qemuxml2argv-disk-drive-cache-v1-none.xml | 1 + .../qemuxml2argv-disk-drive-cache-v1-wb.xml | 1 + .../qemuxml2argv-disk-drive-cache-v1-wt.xml | 1 + .../qemuxml2argv-disk-drive-cache-v2-none.xml | 1 + .../qemuxml2argv-disk-drive-cache-v2-wb.xml | 1 + .../qemuxml2argv-disk-drive-cache-v2-wt.xml | 1 + ...muxml2argv-disk-drive-error-policy-enospace.xml | 1 + .../qemuxml2argv-disk-drive-error-policy-stop.xml | 1 + ...rgv-disk-drive-error-policy-wreport-rignore.xml | 1 + .../qemuxml2argv-disk-drive-fat.xml | 1 + .../qemuxml2argv-disk-drive-fmt-qcow.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd.xml | 1 + .../qemuxml2argv-disk-drive-network-rbd-auth.xml | 1 + ...emuxml2argv-disk-drive-network-rbd-ceph-env.xml | 1 + .../qemuxml2argv-disk-drive-network-rbd.xml | 1 + .../qemuxml2argv-disk-drive-network-sheepdog.xml | 1 + .../qemuxml2argv-disk-drive-no-boot.xml | 1 + .../qemuxml2argv-disk-drive-readonly-disk.xml | 1 + .../qemuxml2argv-disk-drive-readonly-no-device.xml | 1 + .../qemuxml2argv-disk-drive-shared.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 1 + .../qemuxml2argv-disk-ioeventfd.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml | 1 + .../qemuxml2argv-disk-sata-device.xml | 1 + .../qemuxml2argv-disk-scsi-device-auto.xml | 1 + .../qemuxml2argv-disk-scsi-device.xml | 1 + .../qemuxml2argv-disk-scsi-virtio-scsi.xml | 1 + .../qemuxml2argv-disk-scsi-vscsi.xml | 1 + .../qemuxml2argv-disk-snapshot.xml | 1 + .../qemuxml2argv-disk-transient.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 1 + .../qemuxml2argv-encrypted-disk.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 1 + .../qemuxml2argv-floppy-drive-fat.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml | 1 + .../qemuxml2argv-graphics-listen-network.xml | 1 + .../qemuxml2argv-graphics-listen-network2.xml | 1 + .../qemuxml2argv-graphics-sdl-fullscreen.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 1 + .../qemuxml2argv-graphics-spice-compression.xml | 1 + .../qemuxml2argv-graphics-spice-qxl-vga.xml | 1 + .../qemuxml2argv-graphics-spice.xml | 1 + .../qemuxml2argv-graphics-vnc-sasl.xml | 1 + .../qemuxml2argv-graphics-vnc-socket.xml | 1 + .../qemuxml2argv-graphics-vnc-tls.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 1 + .../qemuxml2argv-hostdev-pci-address.xml | 1 + .../qemuxml2argv-hostdev-usb-address.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml | 1 + .../qemuxml2argv-input-usbmouse-addr.xml | 1 + .../qemuxml2argv-input-usbmouse.xml | 1 + .../qemuxml2argv-input-usbtablet.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-lease.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-memtune.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 1 + .../qemuxml2argv-misc-no-reboot.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-monitor-json.xml | 1 + .../qemuxml2argv-net-bandwidth.xml | 1 + .../qemuxml2argv-net-eth-ifname.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 1 + .../qemuxml2argv-net-virtio-device.xml | 1 + .../qemuxml2argv-net-virtio-netdev.xml | 1 + .../qemuxml2argv-net-virtio-network-portgroup.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 1 + .../qemuxml2argv-nographics-vga.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 1 + .../qemuxml2argv-qemu-ns-no-env.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml | 1 + .../qemuxml2argv-restore-v2-fd.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 1 + .../qemuxml2argv-seclabel-dynamic-baselabel.xml | 1 + .../qemuxml2argv-seclabel-dynamic-override.xml | 1 + .../qemuxml2argv-seclabel-none.xml | 1 + .../qemuxml2argv-seclabel-static.xml | 1 + .../qemuxml2argv-serial-dev-chardev.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 1 + .../qemuxml2argv-serial-file-chardev.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-file.xml | 1 + .../qemuxml2argv-serial-many-chardev.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-many.xml | 1 + .../qemuxml2argv-serial-pty-chardev.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 1 + .../qemuxml2argv-serial-tcp-chardev.xml | 1 + .../qemuxml2argv-serial-tcp-telnet-chardev.xml | 1 + .../qemuxml2argv-serial-tcp-telnet.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 1 + .../qemuxml2argv-serial-udp-chardev.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 1 + .../qemuxml2argv-serial-unix-chardev.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 1 + .../qemuxml2xmlout-balloon-device-auto.xml | 1 + .../qemuxml2xmlout-channel-virtio-auto.xml | 1 + .../qemuxml2xmlout-console-compat-auto.xml | 1 + .../qemuxml2xmlout-console-virtio.xml | 1 + .../qemuxml2xmlout-disk-cdrom-empty.xml | 1 + .../qemuxml2xmlout-disk-scsi-device-auto.xml | 1 + .../qemuxml2xmlout-graphics-listen-network2.xml | 1 + .../qemuxml2xmlout-graphics-spice-timeout.xml | 1 + .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 1 + .../qemuxml2xmlout-serial-target-port-auto.xml | 1 + 162 files changed, 216 insertions(+), 45 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6949ece..a1b5f8f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -619,7 +619,6 @@ VIR_ENUM_IMPL(virDomainStartupPolicy, VIR_DOMAIN_STARTUP_POLICY_LAST, #define VIR_DOMAIN_XML_WRITE_FLAGS VIR_DOMAIN_XML_SECURE #define VIR_DOMAIN_XML_READ_FLAGS VIR_DOMAIN_XML_INACTIVE - void virBlkioDeviceWeightArrayClear(virBlkioDeviceWeightPtr deviceWeights, int ndevices) @@ -7091,6 +7090,49 @@ error: } +static int virDomainDefMaybeAddController(virDomainDefPtr def, + int type, + int idx) +{ + int found = 0; + int i; + virDomainControllerDefPtr cont; + + for (i = 0 ; (i < def->ncontrollers) && !found; i++) { + if (def->controllers[i]->type == type && + def->controllers[i]->idx == idx) + found = 1; + } + + if (found) + return 0; + + if (VIR_ALLOC(cont) < 0) { + virReportOOMError(); + return -1; + } + + cont->type = type; + cont->idx = idx; + cont->model = -1; + + if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) { + cont->opts.vioserial.ports = -1; + cont->opts.vioserial.vectors = -1; + } + + + if (VIR_REALLOC_N(def->controllers, def->ncontrollers+1) < 0) { + VIR_FREE(cont); + virReportOOMError(); + return -1; + } + def->controllers[def->ncontrollers] = cont; + def->ncontrollers++; + + return 0; +} + static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, xmlDocPtr xml, xmlNodePtr root, @@ -7649,6 +7691,12 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, } VIR_FREE(nodes); + if (def->virtType == VIR_DOMAIN_VIRT_QEMU || + def->virtType == VIR_DOMAIN_VIRT_KQEMU || + def->virtType == VIR_DOMAIN_VIRT_KVM) + if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, 0) < 0) + goto error; + /* analysis of the resource leases */ if ((n = virXPathNodeSet("./devices/lease", ctxt, &nodes)) < 0) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -9378,49 +9426,6 @@ cleanup: } -static int virDomainDefMaybeAddController(virDomainDefPtr def, - int type, - int idx) -{ - int found = 0; - int i; - virDomainControllerDefPtr cont; - - for (i = 0 ; (i < def->ncontrollers) && !found; i++) { - if (def->controllers[i]->type == type && - def->controllers[i]->idx == idx) - found = 1; - } - - if (found) - return 0; - - if (VIR_ALLOC(cont) < 0) { - virReportOOMError(); - return -1; - } - - cont->type = type; - cont->idx = idx; - cont->model = -1; - - if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) { - cont->opts.vioserial.ports = -1; - cont->opts.vioserial.vectors = -1; - } - - - if (VIR_REALLOC_N(def->controllers, def->ncontrollers+1) < 0) { - VIR_FREE(cont); - virReportOOMError(); - return -1; - } - def->controllers[def->ncontrollers] = cont; - def->ncontrollers++; - - return 0; -} - static int virDomainDefAddDiskControllersForType(virDomainDefPtr def, int controllerType, int diskBus) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0e26df1..e171641 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7621,7 +7621,13 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, WANT_VALUE(); /* ignore, generted on the fly */ } else if (STREQ(arg, "-usb")) { - /* ignore, always added by libvirt */ + virDomainControllerDefPtr ctldef; + if (VIR_ALLOC(ctldef) < 0) + goto no_memory; + ctldef->type = VIR_DOMAIN_CONTROLLER_TYPE_USB; + ctldef->idx = 0; + ctldef->model = -1; + virDomainControllerInsert(def, ctldef); } else if (STREQ(arg, "-pidfile")) { WANT_VALUE(); if (pidfile) diff --git a/tests/define-dev-segfault b/tests/define-dev-segfault index 3feff46..0a0532b 100755 --- a/tests/define-dev-segfault +++ b/tests/define-dev-segfault @@ -36,6 +36,7 @@ cat <<\EOF > D.xml || fail=1 <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> + <controller type='usb' index='0'/> <serial type='pty'> <target port='0'/> </serial> diff --git a/tests/domainsnapshotxml2xmlout/disk_snapshot.xml b/tests/domainsnapshotxml2xmlout/disk_snapshot.xml index a0a0965..91dba79 100644 --- a/tests/domainsnapshotxml2xmlout/disk_snapshot.xml +++ b/tests/domainsnapshotxml2xmlout/disk_snapshot.xml @@ -69,6 +69,7 @@ <target dev='hdf' bus='ide'/> <address type='drive' controller='0' bus='5' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/domainsnapshotxml2xmlout/full_domain.xml b/tests/domainsnapshotxml2xmlout/full_domain.xml index 76f17e1..3063910 100644 --- a/tests/domainsnapshotxml2xmlout/full_domain.xml +++ b/tests/domainsnapshotxml2xmlout/full_domain.xml @@ -27,6 +27,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/domainsnapshotxml2xmlout/metadata.xml b/tests/domainsnapshotxml2xmlout/metadata.xml index f0ad70b..9553b17 100644 --- a/tests/domainsnapshotxml2xmlout/metadata.xml +++ b/tests/domainsnapshotxml2xmlout/metadata.xml @@ -31,6 +31,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml index 5ce3e24..9b71164 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml @@ -21,6 +21,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='pty'> <target port='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml index 7b6ec8f..6b4da65 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml @@ -35,6 +35,7 @@ </iotune> <address type='drive' controller='0' bus='0' unit='1'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml index 3412753..6c2d282 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml @@ -30,6 +30,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml index 4fa03ef..ae7133f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml @@ -22,6 +22,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml index 14ccd23..183894b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml @@ -20,6 +20,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml index b4d6f4f..860f52e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml @@ -50,6 +50,7 @@ <target dev='fda' bus='fdc'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='fdc' index='0'/> <controller type='ide' index='0'/> <interface type='user'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml index b4d6f4f..860f52e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml @@ -50,6 +50,7 @@ <target dev='fda' bus='fdc'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='fdc' index='0'/> <controller type='ide' index='0'/> <interface type='user'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml index db3a94f..ff20736 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml @@ -24,6 +24,7 @@ <target dev='fda' bus='fdc'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='fdc' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml index bc1da8a..66a64df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml @@ -21,6 +21,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml index bc1da8a..66a64df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml @@ -21,6 +21,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml index bc1da8a..66a64df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml @@ -21,6 +21,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml index c35b2bd..d92f681 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml @@ -21,6 +21,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml index 44ca0fa..09556da 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml @@ -24,6 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml index d3f3369..aec0796 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml index 68741fe..f46ef5c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml @@ -40,6 +40,7 @@ <boot order='4'/> <address type='drive' controller='0' bus='0' unit='1'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='fdc' index='0'/> <interface type='user'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml index 6ce846d..332e6b6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml @@ -20,6 +20,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml index b1d5281..1016ead 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <channel type='pipe'> <source path='/tmp/guestfwd'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml index 0e82394..9b53469 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml @@ -18,6 +18,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='virtio-serial' index='1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml index 0e82394..9b53469 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml @@ -18,6 +18,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='virtio-serial' index='1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml index c127d84..dd3bd9d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='virtio-serial' index='0' ports='16' vectors='4'/> <controller type='virtio-serial' index='1'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml index f612c02..e13f8b9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='virtio-serial' index='1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml index 017ef39..60560ee 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml index ed746c1..958b3d2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml index 479a1d9..317f793 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml index 9f52cca..eea6ce4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml index bd19988..7fb2ff9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <console type='pty'> <target port='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml index 0bf52f4..1a7899a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='pty'> <target port='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml index 9011522..f579b11 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='pty'> <target port='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml index e65fb74..71b7fbe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='virtio-serial' index='0'/> <serial type='pty'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml index 259af4a..8311e59 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <console type='pty'> <target type='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml index 15a9e44..50f582b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml @@ -18,6 +18,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/./qemu.sh</emulator> + <controller type='usb' index='0'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml index 2b51b0e..63a6163 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml @@ -19,6 +19,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/./qemu.sh</emulator> + <controller type='usb' index='0'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune.xml index 091865a..b892320 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cputune.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune.xml @@ -26,6 +26,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml index f6d7633..12b114f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml @@ -27,6 +27,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml index bc40d16..565b8e2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml @@ -24,6 +24,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml index 2fd2e6a..cea3f4a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml @@ -25,6 +25,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml index 433c641..a94623a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml @@ -32,6 +32,7 @@ <model type='virtio'/> <driver name='vhost' txmode='iothread'/> </interface> + <controller type='usb' index='0'/> <controller type='virtio-serial' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </controller> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml index 434cd7e..a018655 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml @@ -24,6 +24,7 @@ <target dev='hdc' bus='ide'/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml index 452cb82..ba27ec6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml @@ -24,6 +24,7 @@ <target dev='hdc' bus='ide'/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml index 17d7c1c..1996223 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml @@ -27,6 +27,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml index 37185f6..562ff0a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml @@ -27,6 +27,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml index 3f60871..2d954de 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml @@ -27,6 +27,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml index 6a4e8e3..adb243d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml @@ -27,6 +27,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml index 5f351f5..0c50f48 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml @@ -27,6 +27,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml index da07d5e..fcf52a4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml @@ -27,6 +27,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml index 8c30aec..5445be6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml @@ -27,6 +27,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml index a9e0c33..de543a9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml @@ -27,6 +27,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml index f9a56ab..694c59b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml @@ -27,6 +27,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml index 6d99607..34fe20f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml @@ -27,6 +27,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml index 70068aa..80cf5fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml @@ -27,6 +27,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml index d473711..fdf2030 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml @@ -21,6 +21,7 @@ <readonly/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml index cc88ef5..dbece24 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml @@ -27,6 +27,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml index c0255a8..7ba0ab0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml @@ -26,6 +26,7 @@ </source> <target dev='vda' bus='virtio'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.xml index 88f7f7a..a81bf1a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.xml @@ -31,6 +31,7 @@ </source> <target dev='vda' bus='virtio'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml index e920db1..f0bcfd5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml @@ -28,6 +28,7 @@ </source> <target dev='vda' bus='virtio'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml index e920db1..f0bcfd5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml @@ -28,6 +28,7 @@ </source> <target dev='vda' bus='virtio'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml index 83d6c4e..cd0eef4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml @@ -26,6 +26,7 @@ </source> <target dev='vda' bus='virtio'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml index a7e08fd..88ce751 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml @@ -31,6 +31,7 @@ <target dev='fda' bus='fdc'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='fdc' index='0'/> <controller type='ide' index='0'/> <memballoon model='none'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml index c0cf6a4..380f850 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml @@ -25,6 +25,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml index c0cf6a4..380f850 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml @@ -25,6 +25,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml index 8dcf4b7..c155040 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml @@ -29,6 +29,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml index 6c2a18d..99adcd4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml @@ -29,6 +29,7 @@ <target dev='fdb' bus='fdc'/> <address type='drive' controller='0' bus='0' unit='1'/> </disk> + <controller type='usb' index='0'/> <controller type='fdc' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml index c565c9f..3bc82cb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml @@ -32,6 +32,7 @@ <model type='virtio'/> <driver name='vhost' txmode='iothread' ioeventfd='off'/> </interface> + <controller type='usb' index='0'/> <controller type='virtio-serial' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </controller> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml index 3b28a34..c04d6e2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml @@ -34,6 +34,7 @@ <target dev='hdd' bus='ide'/> <address type='drive' controller='0' bus='1' unit='1'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml index b07bbed..d89e57b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml @@ -31,6 +31,7 @@ <source file='/tmp/data.img'/> <target dev='vda' bus='virtio'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml index 68a14f2..81f30e5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml @@ -19,6 +19,7 @@ <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='sata' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml index a7e55b0..fbbf6ed 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml @@ -18,6 +18,7 @@ <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <disk type='file' device='disk'> <source file='/tmp/scsidisk.img'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml index 530c0a6..17b59d8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml @@ -24,6 +24,7 @@ <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='scsi' index='0'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml index 452ade8..3c61e1f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml @@ -24,6 +24,7 @@ <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='scsi' index='0' model='virtio-scsi'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml index 7cf5798..12f928a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml @@ -24,6 +24,7 @@ <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='scsi' index='0' model='ibmvscsi'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml index aeb2315..2501ac8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml @@ -33,6 +33,7 @@ <target dev='hdb' bus='ide'/> <address type='drive' controller='0' bus='2' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-transient.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-transient.xml index df49c48..e5aef0a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-transient.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-transient.xml @@ -21,6 +21,7 @@ <transient/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml index 0a9adef..a8a505d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml @@ -23,6 +23,7 @@ <source file='/tmp/usbdisk.img'/> <target dev='sda' bus='usb'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml index eef9a1b..9a9e966 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml @@ -33,6 +33,7 @@ <source file='/tmp/logs.img'/> <target dev='vdb' bus='virtio'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml index c940847..4497a04 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml @@ -33,6 +33,7 @@ <source file='/tmp/logs.img'/> <target dev='xvdg' bus='xen'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml index fdcf624..636f7e4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml @@ -23,6 +23,7 @@ </encryption> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> + <controller type='usb' index='0'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml index 81f2200..6dc346d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml @@ -29,6 +29,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='virtio-serial' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </controller> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml index ceee0b8..4d6ebd7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml @@ -21,6 +21,7 @@ <readonly/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='fdc' index='0'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml index e31db48..c187995 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <filesystem type='mount'> <source dir='/export/to/guest'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml index a49e5d3..c341054 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5903' autoport='no'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml index 1c55eff..7985625 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='ps2'/> <graphics type='vnc' listen='1.2.3.4' autoport='yes'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml index 4e11a28..277c1d4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='ps2'/> <graphics type='sdl' display=':0.1' xauth='/root/.Xauthority' fullscreen='yes'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml index cf5aaa9..a5a169a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='ps2'/> <graphics type='sdl' display=':0.1' xauth='/root/.Xauthority'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml index d92211c..33e2190 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='ps2'/> <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml index 65fc2d9..ac1a915 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='ps2'/> <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml index 5313b3a..d4e68e4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='ps2'/> <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml index 1f6c115..339b1fd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml index 19c9213..e3151e5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='ps2'/> <graphics type='vnc' socket='/tmp/foo.socket'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml index 1f6c115..339b1fd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml index f93facc..ad2bfc0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5903' autoport='no' listen='2001:1:2:3:4:5:1234:1234'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml index a88ada4..a7f0410 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <hostdev mode='subsystem' type='pci' managed='yes'> <source> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml index c224291..80b4771 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <hostdev mode='subsystem' type='usb' managed='no'> <source> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml index 78bf4e1..fa0bb96 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml @@ -22,6 +22,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.xml index a2fa8e3..858b385 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='usb'> <address type='usb' bus='0' port='4'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml index b9aff61..cc78f9f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='usb'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml index 18d5cb5..c042ed2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='tablet' bus='usb'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml index fb42c95..0b82b3b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='xen'/> <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml index 6ff3b35..fbd31ec 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml @@ -16,6 +16,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/kvm</emulator> + <controller type='usb' index='0'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-lease.xml b/tests/qemuxml2argvdata/qemuxml2argv-lease.xml index 7efe1ef..b998f62 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-lease.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-lease.xml @@ -25,6 +25,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <lease> <lockspace>somearea</lockspace> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune.xml b/tests/qemuxml2argvdata/qemuxml2argv-memtune.xml index 37b5c88..c81a253 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memtune.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune.xml @@ -24,6 +24,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml index 99e81ae..e16fce5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml b/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml index 51eb59a..d060271 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml @@ -24,6 +24,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml index d5f8d2f..a4fce92 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml @@ -22,6 +22,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml index b06493f..b84a0b4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml index d5f8d2f..a4fce92 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml @@ -22,6 +22,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.xml b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.xml index 1901715..6760304 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.xml @@ -19,6 +19,7 @@ <source file='/dev/hda1'/> <target dev='hda'/> </disk> + <controller type='usb' index='0'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml index 852c97b..d5e4b9a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml @@ -34,6 +34,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml index a638e06..bd5a153 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml index d5c4b36..61836be 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml index 540808d..4a6f041 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <interface type='user'> <mac address='00:11:22:33:44:55'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml index 4e7abcd..013c444 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <interface type='user'> <mac address='00:11:22:33:44:55'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml index 5f2b12c..2e46562 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml @@ -18,6 +18,7 @@ <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> </disk> + <controller type='usb' index='0'/> <interface type='user'> <mac address='00:11:22:33:44:55'/> <model type='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-network-portgroup.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-network-portgroup.xml index 0f6e076..4a56f59 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-network-portgroup.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-network-portgroup.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <interface type='network'> <mac address='00:11:22:33:44:55'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml index ec930b3..f17b5a9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <interface type='user'> <mac address='00:11:22:33:44:55'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml index 99e81ae..e16fce5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml index 5c50ecc..67cf661 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <parallel type='tcp'> <source mode='bind' host='127.0.0.1' service='9999'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml index 731a69d..51eecbc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <interface type='user'> <mac address='52:54:00:24:a5:9f'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml index 0d9dd98..9bf8da7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml index 479a1d9..317f793 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml index 99e81ae..e16fce5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml index 99e81ae..e16fce5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml index fea0eb7..dfbdf9e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml index 19b1cbb..c34243b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml @@ -31,6 +31,7 @@ <readonly/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml index 1ef97ce..7b48206 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml index 416bd86..2a8dd5b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml index ea5a3f8..b6f9d29 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='dev'> <source path='/dev/ttyS2'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml index 41f473a..56f9006 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='dev'> <source path='/dev/ttyS2'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml index 9a3e197..c64da73 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='file'> <source path='/tmp/serial.log'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml index 975d81e..54bfc93 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='file'> <source path='/tmp/serial.log'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml index d6116e8..29e12be 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='pty'> <target port='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml index e68ad79..371fc44 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='pty'> <target port='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml index 57d1b74..17fc702 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='pty'> <target port='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml index 19dd131..7e2ca30 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='pty'> <target port='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml index cd43384..2b1f5d4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='tcp'> <source mode='connect' host='127.0.0.1' service='9999'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml index 14bead4..1cebeff 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='tcp'> <source mode='bind' host='127.0.0.1' service='9999'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml index ad5a038..3b8dca8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='tcp'> <source mode='bind' host='127.0.0.1' service='9999'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml index 45ad585..fe19f8b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='tcp'> <source mode='connect' host='127.0.0.1' service='9999'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml index 9627c67..52ccc94 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='udp'> <source mode='bind' host='127.0.0.1' service='9999'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml index f606ea4..31c9104 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='udp'> <source mode='bind' host='127.0.0.1' service='9999'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml index 4ed72aa..e86c1ae 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='unix'> <source mode='connect' path='/tmp/serial.sock'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml index 4685ad4..053cec1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='unix'> <source mode='connect' path='/tmp/serial.sock'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml index 6100332..c086092 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='vc'> <target port='0'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml index cba15dc..9d0d918 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml @@ -22,6 +22,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml index 57cabb4..e5b3f13 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <sound model='pcspk'/> <sound model='es1370'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml index 63107d5..1b183aa 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml @@ -28,6 +28,7 @@ <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </disk> + <controller type='usb' index='0'/> <controller type='virtio-serial' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </controller> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml index 06da70b..e1f6e56 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <watchdog model='ib700' action='poweroff'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml index 479a1d9..317f793 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml index a52ea8e..1602b6c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='virtio-serial' index='0' ports='16' vectors='4'/> <controller type='virtio-serial' index='1'> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml index 9011522..f579b11 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <serial type='pty'> <target port='0'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml index b64c7e5..f1f70c7 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='virtio-serial' index='0'/> <console type='pty'> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml index 9299da3..897b0d2 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml @@ -25,6 +25,7 @@ <readonly/> <address type='drive' controller='0' bus='1' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml index 530c0a6..17b59d8 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml @@ -24,6 +24,7 @@ <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <controller type='scsi' index='0'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml index d369b89..188e14a 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml @@ -19,6 +19,7 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='usb' index='0'/> <controller type='ide' index='0'/> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' listen='1.2.3.4'> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml index ac72822..53298d1 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml @@ -58,6 +58,7 @@ <controller type='virtio-serial' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </controller> + <controller type='usb' index='0'/> <interface type='ethernet'> <mac address='52:54:00:71:70:89'/> <script path='/etc/qemu-ifup'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml index a029404..01b820d 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml @@ -24,6 +24,7 @@ <address type='drive' controller='0' bus='0' unit='0'/> </disk> <controller type='ide' index='0'/> + <controller type='usb' index='0'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml index 878418a..44472c7 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml @@ -20,6 +20,7 @@ <address type='drive' controller='0' bus='0' unit='0'/> </disk> <controller type='ide' index='0'/> + <controller type='usb' index='0'/> <serial type='pty'> <target port='0'/> </serial> -- 1.7.7.6

6 5

[libvirt] [PATCH] Cleanup of the quick dirty fix from last week
by Martin Kletzander 10 Feb '12

10 Feb '12

I tried lots of different solutions and this seems like the most clean and readable one. --- src/lxc/lxc_container.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index e93fda5..c55f264 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -449,8 +449,6 @@ static int lxcContainerMountBasicFS(const char *srcprefix, bool pivotRoot) char *opts = NULL; #if HAVE_SELINUX security_context_t con; -#else - bool con = false; #endif VIR_DEBUG("Mounting basic filesystems %s pivotRoot=%d", NULLSTR(srcprefix), pivotRoot); @@ -511,10 +509,14 @@ static int lxcContainerMountBasicFS(const char *srcprefix, bool pivotRoot) * tmpfs is limited to 64kb, since we only have device nodes in there * and don't want to DOS the entire OS RAM usage */ +#if HAVE_SELINUX if (virAsprintf(&opts, "mode=755,size=65536%s%s%s", con ? ",context=\"" : "", con ? (const char *)con : "", con ? "\"" : "") < 0) { +#else + if (virAsprintf(&opts, "mode=755,size=65536") < 0) { +#endif virReportOOMError(); goto cleanup; } -- 1.7.3.4

3 2

[libvirt] [PATCHv2] python: Expose virDomain{G, S}etInterfaceParameters' APIs in python binding
by ajia＠redhat.com 10 Feb '12

10 Feb '12

From: Alex Jia <ajia(a)redhat.com> The v2 patch to follow latest python binding codes change. An simple example to show how to use it: #!/usr/bin/env python import libvirt conn = libvirt.open(None) dom = conn.lookupByName('foo') print dom.interfaceParameters('vnet0', 0) params = {'outbound.peak': 10, 'inbound.peak': 10, 'inbound.burst': 20, 'inbound.average': 20, 'outbound.average': 30, 'outbound.burst': 30} print dom.setInterfaceParameters('vnet0', params, 0) print dom.interfaceParameters('vnet0', 0) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override-api.xml | 16 +++++ python/libvirt-override.c | 125 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 8eed0bb..2802e19 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -261,6 +261,22 @@ <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> + <function name='virDomainSetInterfaceParameters' file='python'> + <info>Change the bandwidth tunables for a interface device</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='device' type='const char *' info='interface name'/> + <arg name='params' type='virTypedParameterPtr' info='Pointer to bandwidth tuning params object'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> + <return type='int' info='0 in case of success, -1 in case of failure'/> + </function> + <function name='virDomainGetInterfaceParameters' file='python'> + <info>Get the bandwidth tunables for a interface device</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='device' type='const char *' info='interface name'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> + <return type='virTypedParameterPtr' info='the bandwidth tunables value or None in case of error'/> + </function> + <function name='virConnectListStoragePools' file='python'> <info>list the storage pools, stores the pointers to the names in @names</info> <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index e7c2bd5..6806057 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1356,6 +1356,129 @@ cleanup: } static PyObject * +libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *info; + PyObject *ret = NULL; + int i_retval; + int nparams = 0, size = 0; + unsigned int flags; + const char *device = NULL; + virTypedParameterPtr params, new_params; + + if (!PyArg_ParseTuple(args, + (char *)"OzOi:virDomainSetInterfaceParameters", + &pyobj_domain, &device, &info, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if ((size = PyDict_Size(info)) < 0) + return NULL; + + if (size == 0) { + PyErr_Format(PyExc_LookupError, + "Need non-empty dictionary to set attributes"); + return NULL; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_INT_FAIL; + + if (nparams == 0) { + PyErr_Format(PyExc_LookupError, + "Domain has no settable attributes"); + return NULL; + } + + if (VIR_ALLOC_N(params, nparams) < 0) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + + new_params = setPyVirTypedParameter(info, params, nparams); + if (!new_params) + goto cleanup; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainSetInterfaceParameters(domain, device, new_params, size, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + + ret = VIR_PY_INT_SUCCESS; + +cleanup: + virTypedParameterArrayClear(params, nparams); + VIR_FREE(params); + VIR_FREE(new_params); + return ret; +} + +static PyObject * +libvirt_virDomainGetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain; + PyObject *ret = NULL; + int i_retval; + int nparams = 0; + unsigned int flags; + const char *device = NULL; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainGetInterfaceParameters", + &pyobj_domain, &device, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_NONE; + + if (!nparams) + return PyDict_New(); + + if (VIR_ALLOC_N(params, nparams) < 0) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_NONE; + goto cleanup; + } + + ret = getPyVirTypedParameter(params, nparams); + +cleanup: + virTypedParameterArrayClear(params, nparams); + VIR_FREE(params); + return ret; +} + +static PyObject * libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; @@ -5556,6 +5679,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetMemoryParameters", libvirt_virDomainGetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virDomainSetNumaParameters", libvirt_virDomainSetNumaParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetNumaParameters", libvirt_virDomainGetNumaParameters, METH_VARARGS, NULL}, + {(char *) "virDomainSetInterfaceParameters", libvirt_virDomainSetInterfaceParameters, METH_VARARGS, NULL}, + {(char *) "virDomainGetInterfaceParameters", libvirt_virDomainGetInterfaceParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetVcpus", libvirt_virDomainGetVcpus, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpu", libvirt_virDomainPinVcpu, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpuFlags", libvirt_virDomainPinVcpuFlags, METH_VARARGS, NULL}, -- 1.7.1

1 0

[libvirt] [PATCH] rpc: Plug memory leaks on doRemoteOpen() failure path
by ajia＠redhat.com 10 Feb '12

10 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leaks are introduced in commit c1b2264. * src/remote/remote_driver.c (doRemoteOpen): free client program memory in failure path. * How to reproduce? % valgrind -v --leak-check=full virsh -c qemu: * Actual result ==3969== 40 bytes in 1 blocks are definitely lost in loss record 8 of 28 ==3969== at 0x4A04A28: calloc (vg_replace_malloc.c:467) ==3969== by 0x4C89C41: virAlloc (memory.c:101) ==3969== by 0x4D5A236: virNetClientProgramNew (virnetclientprogram.c:60) ==3969== by 0x4D47AB4: doRemoteOpen (remote_driver.c:658) ==3969== by 0x4D49FFF: remoteOpen (remote_driver.c:871) ==3969== by 0x4D13373: do_open (libvirt.c:1196) ==3969== by 0x4D14535: virConnectOpenAuth (libvirt.c:1422) ==3969== by 0x425627: main (virsh.c:18537) ==3969== ==3969== 40 bytes in 1 blocks are definitely lost in loss record 9 of 28 ==3969== at 0x4A04A28: calloc (vg_replace_malloc.c:467) ==3969== by 0x4C89C41: virAlloc (memory.c:101) ==3969== by 0x4D5A236: virNetClientProgramNew (virnetclientprogram.c:60) ==3969== by 0x4D47AD7: doRemoteOpen (remote_driver.c:664) ==3969== by 0x4D49FFF: remoteOpen (remote_driver.c:871) ==3969== by 0x4D13373: do_open (libvirt.c:1196) ==3969== by 0x4D14535: virConnectOpenAuth (libvirt.c:1422) ==3969== by 0x425627: main (virsh.c:18537) ==3969== ==3969== LEAK SUMMARY: ==3969== definitely lost: 80 bytes in 2 blocks Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/remote/remote_driver.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index e068126..2dacb70 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -753,6 +753,8 @@ doRemoteOpen (virConnectPtr conn, free_qparam_set (vars); failed: + virNetClientProgramFree(priv->remoteProgram); + virNetClientProgramFree(priv->qemuProgram); virNetClientClose(priv->client); virNetClientFree(priv->client); priv->client = NULL; -- 1.7.1

3 2

[libvirt] [PATCH][PowerPC] Implement sysinfo for libvirt on PowerPC
by Prerna Saxena 10 Feb '12

10 Feb '12

From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Tue, 7 Feb 2012 16:55:26 +0530 Subject: [PATCH] Implement sysinfo on PowerPC. Libvirt on x86 parses 'dmidecode' to gather characteristics of host system, which are then reflected to libvirt users by virSysinfoRead(), invoked by 'virsh sysinfo'. This patch implements it on PowerPC by reading /proc/cpuinfo. The presently available fields in 'sysinfo' are strongly tied to dmidecode output fields. This patch attempts to retrofit the information available in PowerPC to appropriate sysinfo fields. I will be happy to change the organization of this information to if there are expected outputs for individual fields. (I couldnt find any documentation which explained what each sysinfo field was expected to convey.) TODOS: 1. Adding Memory DIMM information 2) Firmware (<bios>) details. 3) Expand <processor> tag to have more fields available. Example output on PowerPC : virsh # sysinfo <sysinfo type='smbios'> <system> <entry name='version'>PowerNV 8246-L2C</entry> <entry name='serial'>8246-L2C</entry> <entry name='family'>PowerNV</entry> </system> <processor> <entry name='socket_destination'>0</entry> <entry name='type'>POWER7 (raw), altivec supported</entry> <entry name='version'>2.3 (pvr 003f 0203)</entry> </processor> <processor> <entry name='socket_destination'>4</entry> <entry name='type'>POWER7 (raw), altivec supported</entry> <entry name='version'>2.3 (pvr 003f 0203)</entry> </processor> ...... --- src/util/sysinfo.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 144 insertions(+), 2 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index de3108a..4a2ac63 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -44,6 +44,7 @@ __FUNCTION__, __LINE__, __VA_ARGS__) #define SYSINFO_SMBIOS_DECODER "dmidecode" +#define CPUINFO "/proc/cpuinfo" VIR_ENUM_IMPL(virSysinfo, VIR_SYSINFO_LAST, "smbios"); @@ -113,10 +114,151 @@ void virSysinfoDefFree(virSysinfoDefPtr def) * * Returns: a filled up sysinfo structure or NULL in case of error */ -#if defined(WIN32) || \ + +#if defined(__powerpc__) +static char* +virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) +{ + char *cur, *eol = NULL; + + if ((cur = strstr(base, "platform")) == NULL) + return base; + + base = cur; + /* Account for format 'platform : XXXX'*/ + cur = strchr(cur, ':') + 1; + eol = strchr(cur, '\n'); + if ((eol) && + ((ret->system_family = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + virSkipSpaces(&(ret->system_family)); + + if ((cur = strstr(base, "model")) != NULL) { + cur = strchr(cur, ':') + 1; + eol = strchr(cur, '\n'); + if ((eol) && ((ret->system_serial = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + virSkipSpaces(&(ret->system_serial)); + } + + if ((cur = strstr(base, "machine")) != NULL) { + cur = strchr(cur, ':') + 1; + eol = strchr(cur, '\n'); + if ((eol) && ((ret->system_version = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + virSkipSpaces(&(ret->system_version)); + } + + ret->system_manufacturer = NULL; + ret->system_product = NULL; + ret->system_uuid = NULL; + ret->system_sku = NULL; + + return cur; + +no_memory: + return NULL; +} + +static char * +virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) +{ + char *cur, *eol, *tmp_base; + virSysinfoProcessorDefPtr processor; + + while((tmp_base = strstr(base, "processor")) != NULL) { + base = tmp_base; + eol = strchr(base, '\n'); + cur = strchr(base, ':') + 1; + + if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) { + goto no_memory; + } + + processor = &ret->processor[ret->nprocessor - 1]; + if ((eol) && + ((processor->processor_socket_destination = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + virSkipSpaces(&(processor->processor_socket_destination)); + + if ((cur = strstr(base, "cpu")) != NULL) { + cur = strchr(cur, ':') + 1; + eol = strchr(cur, '\n'); + if ((eol) && + ((processor->processor_type = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + virSkipSpaces(&(processor->processor_type)); + } + + if ((cur = strstr(base, "revision")) != NULL) { + cur = strchr(cur, ':') + 1; + eol = strchr(cur, '\n'); + if ((eol) && + ((processor->processor_version = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + virSkipSpaces(&(processor->processor_version)); + } + + /* Mark non-required fields as 'NULL' */ + processor->processor_family = NULL; + processor->processor_manufacturer = NULL; + processor->processor_signature = NULL; + processor->processor_external_clock = NULL; + processor->processor_max_speed = NULL; + processor->processor_status = NULL; + processor->processor_serial_number = NULL; + processor->processor_part_number = NULL; + + base = cur; + } + + return base; + +no_memory: + return NULL; +} + +/* virSysinfoRead for PowerPC */ +virSysinfoDefPtr +virSysinfoRead(void) { + virSysinfoDefPtr ret = NULL; + char *outbuf = NULL; + + if (VIR_ALLOC(ret) < 0) + goto no_memory; + + /* mark irrelevant fields as 'NULL' */ + ret->bios_vendor = NULL; + ret->bios_version = NULL; + ret->bios_date = NULL; + ret->bios_release = NULL; + + if(virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + virSmbiosReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to open %s"),CPUINFO); + return NULL; + } + + ret->nprocessor = 0; + ret->processor = NULL; + if (virSysinfoParseProcessor(outbuf, ret) == NULL) + goto no_memory; + + if (virSysinfoParseSystem(outbuf, ret) == NULL) + goto no_memory; + + return ret; + +no_memory: + VIR_FREE(outbuf); + return NULL; +} + +#elif defined(WIN32) || \ !(defined(__x86_64__) || \ defined(__i386__) || \ - defined(__amd64__)) + defined(__amd64__) || \ + defined(__powerpc__)) virSysinfoDefPtr virSysinfoRead(void) { /* -- 1.7.7 Awaiting feedback, -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 2

[libvirt] [PATCH v4] python: refactoring virTypedParameter conversion for NUMA tuning APIs
by Guannan Ren 10 Feb '12

10 Feb '12

*getPyVirTypedParameter *setPyVirTypedParameter *virDomainSetNumaParameters *virDomainGetNumaParameters --- python/libvirt-override-api.xml | 13 ++ python/libvirt-override.c | 385 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 398 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index b2b8152..8eed0bb 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -248,6 +248,19 @@ <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> + <function name='virDomainSetNumaParameters' file='python'> + <info>Change the NUMA tunables</info> + <return type='int' info='-1 in case of error, 0 in case of success.'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='params' type='virTypedParameterPtr' info='pointer to numa tunable objects'/> + <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> + </function> + <function name='virDomainGetNumaParameters' file='python'> + <info>Get the NUMA parameters</info> + <return type='str *' info='returns a dictionary of params in case of success, None in case of error'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> + </function> <function name='virConnectListStoragePools' file='python'> <info>list the storage pools, stores the pointers to the names in @names</info> <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 33a841d..3c6020b 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -22,6 +22,7 @@ #include "typewrappers.h" #include "libvirt.h" #include "memory.h" +#include "virtypedparam.h" #ifndef __CYGWIN__ extern void initlibvirtmod(void); @@ -62,6 +63,263 @@ static char *py_str(PyObject *obj) return PyString_AsString(str); } +/* Two helper functions to help the conversions between C to Python + * for the virTypedParameter used in the following APIs */ +static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) +getPyVirTypedParameter(PyObject **info, + const virTypedParameterPtr params, int nparams) +{ + PyObject *key, *val; + int i; + + for (i = 0 ; i < nparams ; i++) { + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + val = PyInt_FromLong((long)params[i].value.i); + break; + + case VIR_TYPED_PARAM_UINT: + val = PyInt_FromLong((unsigned long)params[i].value.ui); + break; + + case VIR_TYPED_PARAM_LLONG: + val = PyLong_FromLongLong((long long)params[i].value.l); + break; + + case VIR_TYPED_PARAM_ULLONG: + val = PyLong_FromUnsignedLongLong((unsigned long long)params[i].value.ul); + break; + + case VIR_TYPED_PARAM_DOUBLE: + val = PyFloat_FromDouble((double)params[i].value.d); + break; + + case VIR_TYPED_PARAM_BOOLEAN: + val = PyBool_FromLong((long)params[i].value.b); + break; + + case VIR_TYPED_PARAM_STRING: + val = libvirt_constcharPtrWrap(params[i].value.s); + break; + + default: + return 0; + } + + key = libvirt_constcharPtrWrap(params[i].field); + if (!key || !val) + goto cleanup; + + if (PyDict_SetItem(*info, key, val) < 0) + goto cleanup; + + Py_DECREF(key); + Py_DECREF(val); + } + return 1; +cleanup: + Py_XDECREF(key); + Py_XDECREF(val); + return -1; +} + +/* Allocate a new typed parameter array with the same contents and + * length as info, and using the array params of length nparams as + * hints on what types to use when creating the new array. Return + * NULL on failure. */ +static virTypedParameterPtr ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) +setPyVirTypedParameter(PyObject *info, + const virTypedParameterPtr params, int nparams) +{ + PyObject *key, *value; + Py_ssize_t pos = 0; + virTypedParameterPtr temp = NULL, ret = NULL; + int size, i; + + if ((size = PyDict_Size(info)) < 0) + return NULL; + + if (VIR_ALLOC_N(ret, size) < 0) { + PyErr_NoMemory(); + return NULL; + } + + temp = &ret[0]; + while (PyDict_Next(info, &pos, &key, &value)) { + char *keystr = NULL; + bool found = false; + + if (PyString_Check(key)) { + if ((keystr = PyString_AsString(key)) == NULL) + goto cleanup; + } else { + PyErr_Format(PyExc_TypeError, + "Attribut name must be string"); + goto cleanup; + } + + for (i = 0; i < nparams; i++) { + if (STREQ(params[i].field, keystr)) { + found = true; + strncpy(temp->field, params[i].field, + sizeof(temp->field)); + temp->type = params[i].type; + + switch(params[i].type) { + case VIR_TYPED_PARAM_INT: + { + long long_val; + if (PyInt_Check(value)) { + long_val = PyInt_AsLong(value); + if ((long_val == -1) && PyErr_Occurred()) + goto cleanup; + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be int", keystr); + goto cleanup; + } + + if ((int)long_val == long_val) { + temp->value.i = (int)long_val; + } else { + PyErr_Format(PyExc_ValueError, + "The value of " + "attribute \"%s\" is out of int range", keystr); + goto cleanup; + } + } + break; + case VIR_TYPED_PARAM_UINT: + { + long long_val; + if (PyInt_Check(value)) { + long_val = PyInt_AsLong(value); + if ((long_val == -1) && PyErr_Occurred()) + goto cleanup; + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be int", keystr); + goto cleanup; + } + + if ((unsigned int)long_val == long_val) { + temp->value.ui = (unsigned int)long_val; + } else { + PyErr_Format(PyExc_ValueError, + "The value of " + "attribute \"%s\" is out of int range", keystr); + goto cleanup; + } + } + break; + case VIR_TYPED_PARAM_LLONG: + { + long long llong_val; + if (PyLong_Check(value)) { + llong_val = PyLong_AsLongLong(value); + if ((llong_val == -1) && PyErr_Occurred()) + goto cleanup; + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be long", keystr); + goto cleanup; + } + temp->value.l = llong_val; + } + break; + case VIR_TYPED_PARAM_ULLONG: + { + unsigned long long ullong_val; + if (PyLong_Check(value)) { + ullong_val = PyLong_AsUnsignedLongLong(value); + if ((ullong_val == -1) && PyErr_Occurred()) + goto cleanup; + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be long", keystr); + goto cleanup; + + } + temp->value.ul = ullong_val; + } + break; + case VIR_TYPED_PARAM_DOUBLE: + { + double double_val; + if (PyFloat_Check(value)) { + double_val = PyFloat_AsDouble(value); + if ((double_val == -1) && PyErr_Occurred()) + goto cleanup; + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be float", keystr); + goto cleanup; + } + temp->value.d = double_val; + } + break; + case VIR_TYPED_PARAM_BOOLEAN: + { + /* Hack - Python's definition of Py_True breaks strict + * aliasing rules, so can't directly compare + */ + if (PyBool_Check(value)) { + PyObject *hacktrue = PyBool_FromLong(1); + temp->value.b = hacktrue == value ? 1: 0; + Py_DECREF(hacktrue); + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be bool", keystr); + goto cleanup; + } + } + break; + case VIR_TYPED_PARAM_STRING: + { + char *string_val; + if (PyString_Check(value)) { + if ((string_val = PyString_AsString(value)) == NULL) + goto cleanup; + if ((temp->value.s = strdup(string_val)) == NULL) { + PyErr_NoMemory(); + goto cleanup; + } + } else { + PyErr_Format(PyExc_TypeError, + "The value type of " + "attribute \"%s\" must be string", keystr); + goto cleanup; + } + } + break; + default: + goto cleanup; + } + } + } + + if (i == nparams && !found) { + PyErr_Format(PyExc_LookupError, + "Attribute name \"%s\" could not be recognized", keystr); + goto cleanup; + } + + temp++; + } + return ret; + +cleanup: + virTypedParameterArrayClear(ret, size); + VIR_FREE(ret); + return NULL; +} + /************************************************************************ * * * Statistics * @@ -1007,6 +1265,131 @@ libvirt_virDomainGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, } static PyObject * +libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *info; + PyObject *ret = NULL; + int i_retval; + int nparams = 0, size = 0; + unsigned int flags; + virTypedParameterPtr params, new_params; + + if (!PyArg_ParseTuple(args, + (char *)"OOi:virDomainSetNumaParameters", + &pyobj_domain, &info, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if ((size = PyDict_Size(info)) < 0) + return NULL; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0 || !nparams) + return VIR_PY_INT_FAIL; + + if (VIR_ALLOC_N(params, nparams) < 0) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + + new_params = setPyVirTypedParameter(info, params, nparams); + if (!new_params) + goto cleanup; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainSetNumaParameters(domain, new_params, size, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + + ret = VIR_PY_INT_SUCCESS; + +cleanup: + virTypedParameterArrayClear(params, nparams); + VIR_FREE(params); + virTypedParameterArrayClear(new_params, size); + VIR_FREE(new_params); + return ret; +} + +static PyObject * +libvirt_virDomainGetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *info; + PyObject *ret = NULL; + int i_retval; + int nparams = 0; + unsigned int flags; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetNumaParameters", + &pyobj_domain, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if ((info = PyDict_New()) == NULL) { + return ret; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_NONE; + + if (!nparams) + return info; + + if (VIR_ALLOC_N(params, nparams) < 0) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_NONE; + goto cleanup; + } + + i_retval = getPyVirTypedParameter(&info, params, nparams); + + if (i_retval < 0) { + Py_XDECREF(info); + goto cleanup; + } else if (i_retval == 0) { + Py_XDECREF(info); + ret = VIR_PY_NONE; + goto cleanup; + } else { + ret = info; + } + +cleanup: + virTypedParameterArrayClear(params, nparams); + VIR_FREE(params); + return ret; +} + +static PyObject * libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; @@ -5203,6 +5586,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetBlkioParameters", libvirt_virDomainGetBlkioParameters, METH_VARARGS, NULL}, {(char *) "virDomainSetMemoryParameters", libvirt_virDomainSetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetMemoryParameters", libvirt_virDomainGetMemoryParameters, METH_VARARGS, NULL}, + {(char *) "virDomainSetNumaParameters", libvirt_virDomainSetNumaParameters, METH_VARARGS, NULL}, + {(char *) "virDomainGetNumaParameters", libvirt_virDomainGetNumaParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetVcpus", libvirt_virDomainGetVcpus, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpu", libvirt_virDomainPinVcpu, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpuFlags", libvirt_virDomainPinVcpuFlags, METH_VARARGS, NULL}, -- 1.7.7.5

3 6

[libvirt] [PATCH] Remove single quotes from audit records
by Marcelo Cerri 10 Feb '12

10 Feb '12

Some audit records generated by libvirt contain fields enclosed by single quotes. Since those fields are inside the msg field, which is enclosed by single quotes, these records generated by libvirt are not correctly parsed by libauparse. --- src/conf/domain_audit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 7d766a2..934e546 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -175,7 +175,7 @@ virDomainAuditNet(virDomainObjPtr vm, } VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, - "virt=%s resrc=net reason=%s %s uuid=%s old-net='%s' new-net='%s'", + "virt=%s resrc=net reason=%s %s uuid=%s old-net=%s new-net=%s", virt, reason, vmname, uuidstr, oldDef ? oldMacstr : "?", newDef ? newMacstr : "?"); @@ -222,7 +222,7 @@ virDomainAuditNetDevice(virDomainDefPtr vmDef, virDomainNetDefPtr netDef, } VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, - "virt=%s resrc=net reason=open %s uuid=%s net='%s' %s rdev=%s", + "virt=%s resrc=net reason=open %s uuid=%s net=%s %s rdev=%s", virt, vmname, uuidstr, macstr, dev_name, VIR_AUDIT_STR(rdev)); cleanup: -- 1.7.1

2 1

Re: [libvirt] [virt-tools-list] Provision through virt-manager not supported on para-virtualized Xen?
by Cole Robinson 09 Feb '12

09 Feb '12

On 02/02/2012 08:54 AM, Cheer Xiao wrote: > 2012/2/2 Cole Robinson <crobinso(a)redhat.com>: >> On 02/02/2012 08:05 AM, Cheer Xiao wrote: >>> Hi all, >>> >>> I was setting up libvirt and virt-manager for managing Xen VMs. But >>> when I hit "New" in virt-manager to provision a new VM, virt-manager >>> gives me the error: "No install options available for this >>> connection." >>> >>> The hypervisor being used is para-virtualized Xen, running on Debian Squeeze. >>> >>> lux-002# xm info >>> host Â Â Â Â Â Â Â Â Â : lux-002 >>> release Â Â Â Â Â Â Â Â : 2.6.32-5-xen-686 >>> version Â Â Â Â Â Â Â Â : #1 SMP Mon Jan 16 19:46:09 UTC 2012 >>> machine Â Â Â Â Â Â Â Â : i686 >>> nr_cpus Â Â Â Â Â Â Â Â : 4 >>> nr_nodes Â Â Â Â Â Â Â : 1 >>> cores_per_socket Â Â Â : 1 >>> threads_per_core Â Â Â : 2 >>> cpu_mhz Â Â Â Â Â Â Â Â : 3200 >>> hw_caps Â Â Â Â Â Â Â Â : >>> bfebfbff:20100000:00000000:00000180:0000641d:00000000:00000001:00000000 >>> virt_caps Â Â Â Â Â Â Â : >>> total_memory Â Â Â Â Â : 8191 >>> free_memory Â Â Â Â Â Â : 1150 >>> node_to_cpu Â Â Â Â Â Â : node0:0-3 >>> node_to_memory Â Â Â Â : node0:1150 >>> node_to_dma32_mem Â Â Â : node0:578 >>> max_node_id Â Â Â Â Â Â : 0 >>> xen_major Â Â Â Â Â Â Â : 4 >>> xen_minor Â Â Â Â Â Â Â : 0 >>> xen_extra Â Â Â Â Â Â Â : .1 >>> xen_caps Â Â Â Â Â Â Â : xen-3.0-x86_32p >>> xen_scheduler Â Â Â Â Â : credit >>> xen_pagesize Â Â Â Â Â : 4096 >>> platform_params Â Â Â Â : virt_start=0xf5800000 >>> xen_changeset Â Â Â Â Â : unavailable >>> xen_commandline Â Â Â Â : placeholder com1=9600,8n1 console=com1,vga >>> cc_compiler Â Â Â Â Â Â : gcc version 4.4.5 (Debian 4.4.5-8) >>> cc_compile_by Â Â Â Â Â : waldi >>> cc_compile_domain Â Â Â : debian.org >>> cc_compile_date Â Â Â Â : Mon Nov Â 7 09:18:26 CET 2011 >>> xend_config_format Â Â : 4 >>> lux-002# libvirtd --version >>> libvirtd (libvirt) 0.8.3 >>> >> >> libvirt pokes into the host machine to try and figure out it's virt >> capabilities. So something must be going wrong there. Here's the function it >> uses in libvirt code: >> >> http://libvirt.org/git/?p=libvirt.git;a=blob;f=src/xen/xen_hypervisor.c;h=b… >> >> Something must be funky or unexpected with /sys/hypervisor/properties/capabilities >> > > This is how it looks: > > lux-002% cat /sys/hypervisor/properties/capabilities > xen-3.0-x86_32p > > So, is provision through on para-virtualized Xen *supposed* to be > supported or not? > That is saying your host supports 32bit paravirt guests only. What's the output of 'virsh --connect xen:/// capabilities' ? - Cole

2 10

[libvirt] Writing java wrappers to libvirt.java
by Dario Ruiz Lopez 09 Feb '12

09 Feb '12

Hello, I am trying to write a java wrapper that could allow to expand current libvirt support for java to intercept invocations to the driver so new functionality can be added, for instance, automatically sending an accounting log of all libvirt invocations to an external server. With the current implementation, the central point to do this seemed to be the interface libvirt.java, which defines an interface constant, INSTANCE, which is used all throughout the library to perform the invocations to the driver. My first idea was to create a wrapper for INSTANCE trying to replace it, but, as libvirt.java is an interface, INSTANCE cannot be reinitialized not overloaded. I might still try this by changing libvirt.java to an abstract class and INSTANCE to a static variable, but I do not think that changing the classes of the library is a good idea, especially for maintenance reasons. Does anybody know if there is any other way to define a wrapper for the invocations to the driver? Best regards, Darío Ruiz López ------------------------------------------------------------------ This e-mail and the documents attached are confidential and intended solely for the addressee; it may also be privileged. If you receive this e-mail in error, please notify the sender immediately and destroy it. As its integrity cannot be secured on the Internet, the Atos group liability cannot be triggered for the message content. Although the sender endeavours to maintain a computer virus-free network, the sender does not warrant that this transmission is virus-free and will not be liable for any damages resulting from any virus transmitted. Este mensaje y los ficheros adjuntos pueden contener informacion confidencial destinada solamente a la(s) persona(s) mencionadas anteriormente pueden estar protegidos por secreto profesional. Si usted recibe este correo electronico por error, gracias por informar inmediatamente al remitente y destruir el mensaje. Al no estar asegurada la integridad de este mensaje sobre la red, Atos no se hace responsable por su contenido. Su contenido no constituye ningun compromiso para el grupo Atos, salvo ratificacion escrita por ambas partes. Aunque se esfuerza al maximo por mantener su red libre de virus, el emisor no puede garantizar nada al respecto y no sera responsable de cualesquiera danos que puedan resultar de una transmision de virus. ------------------------------------------------------------------

1 0

[libvirt] RFC: API to report guest IP address(es)
by Michal Privoznik 09 Feb '12

09 Feb '12

Hi, Now we have qemu guest agent it is possible for us to: 1) extend guest agent to report IP addresses (not trivial among OSes). 2) Write API which will report these to mgmt application. One thing that I am not sure about and would like you to ask is: how should the API look like? In addition, we have this nwfilter which already learns host interfaces address (yeah, only one per interface). What scenarios are we facing here? 1) It is impossible (in general) to tie guest interface with the host interface because guest can change MAC address of any interface and this change is not propagated to the outside world. Therefore vnet1 can be eth0 or eth1 or even hello_i_am_funky_interface99. 2) Guest can create virtual interfaces within itself and therefore create a totally different structure than observed from outside, e.g. bonding. 3) Interface can have multiple addresses or even none. Therefore I lean to something like: int virDomainGetIPAddresses(virDomainPtr dom, char **addr[], int *addr_size); That is - simply return an array of IPs in string format (yes, allocated by us) and leave mgmt application to decide what to do with that. Any thoughts?

4 5

[libvirt] [PATCH] conf: small changes to comments in virDomainDeviceInfo
by Laine Stump 09 Feb '12

09 Feb '12

romfile wasn't mentioned in the comment, and the fact that rombar is now supported for network interfaces also wasn't there. Pushed under the trivial rule. --- src/conf/domain_conf.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0a2795d..8bb21cf 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -167,10 +167,12 @@ struct _virDomainDeviceInfo { union { virDomainDeviceUSBMaster usb; } master; - /* rombar is only used for pci hostdev devices, and bootIndex only - * for disk, network interface, and hostdev devices */ + /* rombar and romfile are only used for pci hostdev and network + * devices. */ int rombar; /* enum virDomainPciRombarMode */ char *romfile; + /* bootIndex is only user for disk, network interface, and + * hostdev devices. */ int bootIndex; }; -- 1.7.7.6

1 0

[libvirt] [PATCH] python: Correct arguments number for migrateSetMaxSpeed
by Osier Yang 09 Feb '12

09 Feb '12

The API definition accepts "flags" argument, however, the implementation ignores it, though "flags" is unused currently, we should expose it instead of hard coding, the API implementation inside hypervisor driver is responsible to check if the passed "flags" is valid. --- python/libvirt-override.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 33a841d..2c6e7cf 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -5062,14 +5062,16 @@ libvirt_virDomainMigrateGetMaxSpeed(PyObject *self ATTRIBUTE_UNUSED, PyObject *a unsigned long bandwidth; virDomainPtr domain; PyObject *pyobj_domain; + unsigned int flags = 0; - if (!PyArg_ParseTuple(args, (char *)"O:virDomainMigrateGetMaxSpeed", &pyobj_domain)) + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainMigrateGetMaxSpeed", + &pyobj_domain, &flags)) return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval = virDomainMigrateGetMaxSpeed(domain, &bandwidth, 0); + c_retval = virDomainMigrateGetMaxSpeed(domain, &bandwidth, flags); LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) -- 1.7.7.3

2 2

[libvirt] [PATCH] docs: fix typo in python bindings
by Eric Blake 09 Feb '12

09 Feb '12

* docs/python.html.in: Class is virConnect, not virConn. --- Pushing this under the trivial rule. docs/python.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/python.html.in b/docs/python.html.in index a8c972e..e7538a4 100644 --- a/docs/python.html.in +++ b/docs/python.html.in @@ -20,7 +20,7 @@ lower case, for example the C functions:</p> </p> <p>become</p> <p> - <code>virConn::numOfDomains(self)</code> + <code>virConnect::numOfDomains(self)</code> </p> <p> <code>virDomain::setMaxMemory(self, memory)</code> -- 1.7.7.6

1 0

[libvirt] [PATCH] cgroup:fix bug to keep --device-weights value persistent
by Guannan Ren 08 Feb '12

08 Feb '12

src/qemu/qemu_driver.c When run "virsh blkiotune dom --device-weights /dev/sda,400 --config" it couldn't be persistent after dom restart. The patch fix it. --- src/qemu/qemu_driver.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d66140b..1a53088 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5975,9 +5975,13 @@ qemuDomainMergeDeviceWeights(virBlkioDeviceWeightPtr *def, size_t *def_size, virReportOOMError(); return -1; } - (*def)[*def_size - 1].path = dw->path; + (*def)[*def_size - 1].path = strdup(dw->path); + if (!(*def)[*def_size - 1].path) { + virReportOOMError(); + return -1; + } + (*def)[*def_size - 1].weight = dw->weight; - dw->path = NULL; } } @@ -5985,6 +5989,46 @@ qemuDomainMergeDeviceWeights(virBlkioDeviceWeightPtr *def, size_t *def_size, } static int +qemuDomainiDefineDeviceWeights(virDomainDefPtr persistentDef, + virBlkioDeviceWeightPtr devices, size_t ndevices) +{ + int i; + virBlkioDeviceWeightPtr dw, result = NULL; + + if (!persistentDef->blkio.devices) { + if (VIR_ALLOC_N(result, ndevices) < 0) { + virReportOOMError(); + goto cleanup; + } + + for (i = 0; i < ndevices; i++) { + dw = &devices[i]; + result[i].path = strdup(dw->path); + if (!result[i].path) { + virReportOOMError(); + goto cleanup; + } + result[i].weight = dw->weight; + } + + persistentDef->blkio.devices = result; + } else { + if (qemuDomainMergeDeviceWeights(&persistentDef->blkio.devices, + &persistentDef->blkio.ndevices, + devices, ndevices) < 0) + return -1; + } + + persistentDef->blkio.ndevices = ndevices; + return 0; + +cleanup: + virBlkioDeviceWeightArrayClear(result, ndevices); + VIR_FREE(result); + return -1; +} + +static int qemuDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr params, int nparams, @@ -6116,6 +6160,11 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, ret = -1; continue; } + if (qemuDomainiDefineDeviceWeights(persistentDef, + devices, + ndevices) < 0) + ret = -1; + if (qemuDomainMergeDeviceWeights(&vm->def->blkio.devices, &vm->def->blkio.ndevices, devices, ndevices) < 0) -- 1.7.7.5

2 4

[libvirt] [PATCH] sysinfo: simplify function signature
by Eric Blake 08 Feb '12

08 Feb '12

Now that no one is relying on the return value being a pointer to somewhere inside of the passed-in argument, we can simplify the callers to simply return success or failure. Also wrap some long lines and add some const-correctness. * src/util/sysinfo.c (virSysinfoParseBIOS, virSysinfoParseSystem) (virSysinfoParseProcessor, virSysinfoParseMemory): Change return. (virSysinfoRead): Adjust caller. --- src/util/sysinfo.c | 104 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 61 insertions(+), 43 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index 0e55d7e..39c7581 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -1,7 +1,7 @@ /* * sysinfo.c: get SMBIOS/sysinfo information from the host * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2010 Daniel Veillard * * This library is free software; you can redistribute it and/or @@ -130,13 +130,13 @@ virSysinfoRead(void) { #else /* !WIN32 && x86 */ -static char * -virSysinfoParseBIOS(char *base, virSysinfoDefPtr ret) +static int +virSysinfoParseBIOS(const char *base, virSysinfoDefPtr ret) { - char *cur, *eol = NULL; + const char *cur, *eol = NULL; if ((cur = strstr(base, "BIOS Information")) == NULL) - return base; + return 0; base = cur; if ((cur = strstr(base, "Vendor: ")) != NULL) { @@ -164,19 +164,19 @@ virSysinfoParseBIOS(char *base, virSysinfoDefPtr ret) goto no_memory; } - return base + strlen("BIOS Information"); + return 0; no_memory: - return NULL; + return -1; } -static char * -virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) +static int +virSysinfoParseSystem(const char *base, virSysinfoDefPtr ret) { - char *cur, *eol = NULL; + const char *cur, *eol = NULL; if ((cur = strstr(base, "System Information")) == NULL) - return base; + return 0; base = cur; if ((cur = strstr(base, "Manufacturer: ")) != NULL) { @@ -223,16 +223,17 @@ virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) goto no_memory; } - return base + strlen("System Information"); + return 0; no_memory: - return NULL; + return -1; } -static char * -virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) +static int +virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret) { - char *cur, *eol, *tmp_base; + const char *cur, *tmp_base; + char *eol; virSysinfoProcessorDefPtr processor; while((tmp_base = strstr(base, "Processor Information")) != NULL) { @@ -249,7 +250,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_socket_destination = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_socket_destination + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Type: ")) != NULL) { @@ -265,7 +267,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_family = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_family = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Manufacturer: ")) != NULL) { @@ -273,7 +276,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_manufacturer = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_manufacturer + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Signature: ")) != NULL) { @@ -281,7 +285,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_signature = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_signature + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Version: ")) != NULL) { @@ -289,7 +294,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_version = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_version = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "External Clock: ")) != NULL) { @@ -297,7 +303,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_external_clock = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_external_clock + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Max Speed: ")) != NULL) { @@ -305,7 +312,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_max_speed = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_max_speed + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Status: ")) != NULL) { @@ -313,7 +321,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_status = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_status = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { @@ -321,7 +330,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_serial_number = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_serial_number + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Part Number: ")) != NULL) { @@ -329,23 +339,25 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((processor->processor_part_number = strndup(cur, eol - cur)) == NULL)) + ((processor->processor_part_number + = strndup(cur, eol - cur)) == NULL)) goto no_memory; } base += strlen("Processor Information"); } - return base; + return 0; no_memory: - return NULL; + return -1; } -static char * -virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) +static int +virSysinfoParseMemory(const char *base, virSysinfoDefPtr ret) { - char *cur, *eol, *tmp_base; + const char *cur, *tmp_base; + char *eol; virSysinfoMemoryDefPtr memory; while ((tmp_base = strstr(base, "Memory Device")) != NULL) { @@ -373,7 +385,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((memory->memory_form_factor = strndup(cur, eol - cur)) == NULL)) + ((memory->memory_form_factor = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Locator: ")) != NULL) { @@ -389,7 +402,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((memory->memory_bank_locator = strndup(cur, eol - cur)) == NULL)) + ((memory->memory_bank_locator = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Type: ")) != NULL) { @@ -405,7 +419,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((memory->memory_type_detail = strndup(cur, eol - cur)) == NULL)) + ((memory->memory_type_detail = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Speed: ")) != NULL) { @@ -421,7 +436,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((memory->memory_manufacturer = strndup(cur, eol - cur)) == NULL)) + ((memory->memory_manufacturer = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { @@ -429,7 +445,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((memory->memory_serial_number = strndup(cur, eol - cur)) == NULL)) + ((memory->memory_serial_number = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } if ((cur = strstr(base, "Part Number: ")) != NULL) { @@ -437,7 +454,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) eol = strchr(cur, '\n'); virSkipSpacesBackwards(cur, &eol); if ((eol) && - ((memory->memory_part_number = strndup(cur, eol - cur)) == NULL)) + ((memory->memory_part_number = strndup(cur, + eol - cur)) == NULL)) goto no_memory; } @@ -445,10 +463,10 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) base += strlen("Memory Device"); } - return base; + return 0; no_memory: - return NULL; + return -1; } virSysinfoDefPtr @@ -481,20 +499,20 @@ virSysinfoRead(void) { ret->type = VIR_SYSINFO_SMBIOS; - if ((virSysinfoParseBIOS(outbuf, ret)) == NULL) + if (virSysinfoParseBIOS(outbuf, ret) < 0) goto no_memory; - if ((virSysinfoParseSystem(outbuf, ret)) == NULL) + if (virSysinfoParseSystem(outbuf, ret) < 0) goto no_memory; ret->nprocessor = 0; ret->processor = NULL; - if ((virSysinfoParseProcessor(outbuf, ret)) == NULL) + if (virSysinfoParseProcessor(outbuf, ret) < 0) goto no_memory; ret->nmemory = 0; ret->memory = NULL; - if (virSysinfoParseMemory(outbuf, ret) == NULL) + if (virSysinfoParseMemory(outbuf, ret) < 0) goto no_memory; cleanup: -- 1.7.7.6

2 2

[libvirt] The weird '@' in bind address on OSX
by Justin Clift 08 Feb '12

08 Feb '12

Hi all, As a general thought, would anyone be interested in getting this weird '@' thing in the bind address on OSX "fixed"? It shows up in both libvirtd and virsh: $ libvirtd 2012-02-08 08:39:53.211+0000: -1: info : libvirt version: 0.9.10 2012-02-08 08:39:53.211+0000: -1: error : virNetSocketNewListenUNIX:346 : Failed to bind socket to '@/Users/jc/.libvirt/libvirt-sock': No such file or directory and $ virsh Welcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # version error: Failed to reconnect to the hypervisor error: no valid connection error: Failed to connect socket to '@/Users/jc/.libvirt/libvirt-sock': No such file or directory Matthias mentioned it's due to using anonymous unix sockets, which are only present on Linux: https://www.redhat.com/archives/libvirt-users/2011-November/msg00018.html Guess that means libvirtd doesn't work on *BSD either? Perhaps gnulib has a cross platform way to take care of this? (Note, I could have sworn eblake started looking into this ages ago, but then I moved on to the Aeolus team. Unsure if there was useful progress back then. ?) Regards and best wishes, Justin Clift -- Aeolus Community Manager http://www.aeolusproject.org

2 1

[libvirt] [PATCH] qemu: Implement DomainPMSuspendForDuration
by Michal Privoznik 08 Feb '12

08 Feb '12

via user agent. --- src/qemu/qemu_agent.c | 31 +++++++++++++++++++ src/qemu/qemu_agent.h | 2 + src/qemu/qemu_driver.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 9df5546..a17d025 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1184,3 +1184,34 @@ cleanup: virJSONValueFree(reply); return ret; } + +VIR_ENUM_DECL(qemuAgentSuspendMode); + +VIR_ENUM_IMPL(qemuAgentSuspendMode, + VIR_NODE_SUSPEND_TARGET_LAST, + "guest-suspend-ram", + "guest-suspend-disk", + "guest-suspend-hybrid"); + +int +qemuAgentSuspend(qemuAgentPtr mon, + unsigned int target) +{ + int ret = -1; + virJSONValuePtr cmd; + virJSONValuePtr reply = NULL; + + cmd = qemuAgentMakeCommand(qemuAgentSuspendModeTypeToString(target), + NULL); + if (!cmd) + return -1; + + ret = qemuAgentCommand(mon, cmd, &reply); + + if (ret == 0) + ret = qemuAgentCheckError(cmd, reply); + + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index df59ef7..98c23b0 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -69,4 +69,6 @@ int qemuAgentShutdown(qemuAgentPtr mon, int qemuAgentFSFreeze(qemuAgentPtr mon); int qemuAgentFSThaw(qemuAgentPtr mon); +int qemuAgentSuspend(qemuAgentPtr mon, + unsigned int target); #endif /* __QEMU_AGENT_H__ */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 52350f2..f91b885 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12042,6 +12042,83 @@ cleanup: return ret; } +static int +qemuDomainPMSuspendForDuration(virDomainPtr dom, + unsigned int target, + unsigned long long duration, + unsigned int flags) +{ + struct qemud_driver *driver = dom->conn->privateData; + qemuDomainObjPrivatePtr priv; + virDomainObjPtr vm; + int ret = -1; + + virCheckFlags(0, -1); + + if (duration) { + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("Duration not supported. Use 0 for now")); + return -1; + } + + if (!(target == VIR_NODE_SUSPEND_TARGET_MEM || + target == VIR_NODE_SUSPEND_TARGET_DISK || + target == VIR_NODE_SUSPEND_TARGET_HYBRID)) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("Unknown suspend target: %u"), + target); + return -1; + } + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + qemuDriverUnlock(driver); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + qemuReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + priv = vm->privateData; + + if (priv->agentError) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("QEMU guest agent is not available due to an error")); + goto cleanup; + } + + if (!priv->agent) { + qemuReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("QEMU guest agent is not configured")); + goto cleanup; + } + + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + + qemuDomainObjEnterAgent(driver, vm); + ret = qemuAgentSuspend(priv->agent, target); + qemuDomainObjExitAgent(driver, vm); + +endjob: + if (qemuDomainObjEndJob(driver, vm) == 0) + vm = NULL; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} + static virDriver qemuDriver = { .no = VIR_DRV_QEMU, .name = "QEMU", @@ -12199,6 +12276,7 @@ static virDriver qemuDriver = { .domainGetDiskErrors = qemuDomainGetDiskErrors, /* 0.9.10 */ .domainSetMetadata = qemuDomainSetMetadata, /* 0.9.10 */ .domainGetMetadata = qemuDomainGetMetadata, /* 0.9.10 */ + .domainPMSuspendForDuration = qemuDomainPMSuspendForDuration, /* 0.9.10 */ }; -- 1.7.3.4

2 1

[libvirt] [PATCH] virsh: Fix flag semantics and docs for "desc" command
by Peter Krempa 08 Feb '12

08 Feb '12

This patch fixes the domain modification impact flags for tie virsh desc command to match the new semantics and fix the docs to match actual behavior. --- tools/virsh.c | 21 +++++++++++++++------ tools/virsh.pod | 12 +++++------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index c107d8c..66ba61c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1051,7 +1051,7 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) virDomainPtr dom; bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); - /* current is ignored */ + bool current = vshCommandOptBool(cmd, "current"); bool title = vshCommandOptBool(cmd, "title"); bool edit = vshCommandOptBool(cmd, "edit"); @@ -1068,6 +1068,19 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) bool ret = false; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; + 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; + } + if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -1084,10 +1097,6 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) virBufferAdd(&buf, opt->data, -1); } - if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; if (title) type = VIR_DOMAIN_METADATA_TITLE; else @@ -1122,7 +1131,7 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* strip a possible newline at the end of file; some * editors enforce a newline, this makes editing the title - * more convinient */ + * more convenient */ if (title && (tmpstr = strrchr(desc_edited, '\n')) && *(tmpstr+1) == '\0') diff --git a/tools/virsh.pod b/tools/virsh.pod index a85da13..21e0f57 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -435,7 +435,7 @@ Define a domain from an XML <file>. The domain definition is registered but not started. If domain is already running, the changes will take effect on the next boot. -=item B<desc> [I<--live> | I<--config>] [I<--title>] [I<--edit>] +=item B<desc> [[I<--live> I<--config> | I<--current>] [I<--title>] [I<--edit>] [I<--new-desc> New description or title message] Show or modify description and title of a domain. These values are user @@ -443,12 +443,10 @@ fields that allow to store arbitrary textual data to allow easy identification of domains. Title should be short, although it's not enforced. Flags I<--live> or I<--config> select whether this command works on live -or persistent definitions of the domain. By default both are influenced, while -modifying and running definition is used while reading the note. - -If both I<--live> and I<--config> are specified, the I<--config> option takes -precedence on getting the current description and both live configuration -and config are updated while setting the description. +or persistent definitions of the domain. If both I<--live> and I<--config> +are specified, the I<--config> option takes precedence on getting the current +description and both live configuration and config are updated while setting +the description. I<--current> is exclusive and implied if none of these was specified. Flag I<--edit> specifies that an editor with the contents of current description or title should be opened and the contents saved back afterwards. -- 1.7.6.1

2 2

[libvirt] [PATCH v2 0/2] qemu: Fix stalls during live core dump
by Jiri Denemark 08 Feb '12

08 Feb '12

Qemu uses non-blocking I/O which doesn't play nice with regular file descriptors. We need to pass a pipe to qemu when dumping core to avoid stalls in live mode. Version 2: - generalize virFileDirectFd a bit more as suggested by Eric Jiri Denemark (2): util: Generalize virFileDirectFd qemu: Always use iohelper for dumping domain core src/qemu/qemu_driver.c | 45 +++++++++++-------- src/util/virfile.c | 118 +++++++++++++++++++++++++++++------------------- src/util/virfile.h | 21 ++++++--- 3 files changed, 112 insertions(+), 72 deletions(-) -- 1.7.8.4

2 7

[libvirt] [PATCH] qemu: Fix memory leak when building -cpu argument
by Jiri Denemark 08 Feb '12

08 Feb '12

Reported by Alex Jia: ==21503== 112 (32 direct, 80 indirect) bytes in 1 blocks are definitely lost in loss record 37 of 40 ==21503== at 0x4A04A28: calloc (vg_replace_malloc.c:467) ==21503== by 0x4A8991: virAlloc (memory.c:101) ==21503== by 0x505A6C: x86DataCopy (cpu_x86.c:247) ==21503== by 0x507B34: x86Compute (cpu_x86.c:1225) ==21503== by 0x43103C: qemuBuildCommandLine (qemu_command.c:3561) ==21503== by 0x41C9F7: testCompareXMLToArgvHelper (qemuxml2argvtest.c:183) ==21503== by 0x41E10D: virtTestRun (testutils.c:141) ==21503== by 0x41B942: mymain (qemuxml2argvtest.c:705) ==21503== by 0x41D7E7: virtTestMain (testutils.c:696) --- I should really stop postponing my work to emebed the architecture into cpu data so that cpuDataFree() only needs one argument. src/qemu/qemu_command.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0e26df1..a346f1e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3666,8 +3666,7 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, ret = 0; cleanup: - if (guest) - cpuDataFree(guest->arch, data); + cpuDataFree(host->arch, data); virCPUDefFree(guest); virCPUDefFree(cpu); -- 1.7.8.4

2 2

[libvirt] [PATCH] Update symbols file for virFileDirectFd/virFileWrapperFd rename
by Daniel P. Berrange 08 Feb '12

08 Feb '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> --- src/libvirt_private.syms | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d6ad36c..eeafd38 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1158,10 +1158,9 @@ virAuditSend; # virfile.h virFileClose; -virFileDirectFdClose; -virFileDirectFdFlag; -virFileDirectFdFree; -virFileDirectFdNew; +virFileWrapperFdClose; +virFileWrapperFdFree; +virFileWrapperFdNew; virFileFclose; virFileFdopen; virFileRewrite; -- 1.7.7.6

3 2

[libvirt] [PATCH] Populate /dev/std{in, out, err} symlinks in LXC containers
by Daniel P. Berrange 08 Feb '12

08 Feb '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Some applications expect /dev/std{in,out,err} to exist. Populate them during container startup as symlinks to /proc/self/fd --- src/lxc/lxc_container.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 04af39b..cb51bbc 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -584,6 +584,14 @@ static int lxcContainerPopulateDevices(char **ttyPaths, size_t nttyPaths) { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_RANDOM, 0666, "/dev/random" }, { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_URANDOM, 0666, "/dev/urandom" }, }; + const struct { + const char *src; + const char *dst; + } links[] = { + { "/proc/self/fd/0", "/dev/stdin" }, + { "/proc/self/fd/1", "/dev/stdout" }, + { "/proc/self/fd/2", "/dev/stderr" }, + }; /* Populate /dev/ with a few important bits */ for (i = 0 ; i < ARRAY_CARDINALITY(devs) ; i++) { @@ -597,6 +605,15 @@ static int lxcContainerPopulateDevices(char **ttyPaths, size_t nttyPaths) } } + for (i = 0 ; i < ARRAY_CARDINALITY(links) ; i++) { + if (symlink(links[i].src, links[i].dst) < 0) { + virReportSystemError(errno, + _("Failed to symlink device %s to %s"), + links[i].dst, links[i].src); + return -1; + } + } + if (access("/dev/pts/ptmx", W_OK) == 0) { /* We have private devpts capability, so bind that */ if (virFileTouch("/dev/ptmx", 0666) < 0) -- 1.7.7.6

2 1

[libvirt] [PATCH] Replace truncate() with ftruncate()
by Daniel P. Berrange 08 Feb '12

08 Feb '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Mingw32 does not have any truncate() API defined, but it does have ftruncate(). So replace use of the former with the latter --- src/util/storage_file.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/util/storage_file.c b/src/util/storage_file.c index 8260adb..a8661e3 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -939,12 +939,29 @@ virStorageFileFreeMetadata(virStorageFileMetadata *meta) int virStorageFileResize(const char *path, unsigned long long capacity) { - if (truncate(path, capacity) < 0) { + int fd = -1; + int ret = -1; + + if ((fd = open(path, O_RDWR)) < 0) { + virReportSystemError(errno, _("Unable to open '%s'"), path); + goto cleanup; + } + + if (ftruncate(fd, capacity) < 0) { virReportSystemError(errno, _("Failed to truncate file '%s'"), path); - return -1; + goto cleanup; } - return 0; + if (VIR_CLOSE(fd) < 0) { + virReportSystemError(errno, _("Unable to save '%s'"), path); + goto cleanup; + } + + ret = 0; + +cleanup: + VIR_FORCE_CLOSE(fd); + return ret; } #ifdef __linux__ -- 1.7.7.6

2 1

[libvirt] [PATCH 0/2] Don't lose running domains configured with no seclabel
by Jiri Denemark 08 Feb '12

08 Feb '12

It's not exactly obvious but these two patches fix quite an ugly bug affecting setups without any useful security driver (i.e., either explicitly or implicitly using driver 'none'). When a domain is defined without any <seclabel> element in its XML and started by libvirt, an incorrect <seclabel> element is put into its runtime XML configuration which causes such domain to disappear from libvirt when libvirtd is restarted. Without these patches, the incorrect element is <seclabel type='dynamic' relabel='yes'/> after applying patch 2/2, the element is <seclabel type='none' relabel='yes'/> which is still wrong and after applying both of these patches, correct element <seclabel type='none'/> is placed into the runtime XML configuration. Jiri Denemark (2): seclabel: Do not output relabel attribute for type 'none' security: Driver 'none' cannot create confined guests src/conf/domain_conf.c | 9 +++++---- src/security/security_manager.c | 20 ++++++++++++++++++++ .../qemuxml2argv-seclabel-none.xml | 2 +- tests/seclabeltest.c | 2 +- 4 files changed, 27 insertions(+), 6 deletions(-) -- 1.7.8.4

2 7

[libvirt] libvirt build errors
by Chandrashekhar Jamadarkhani (cjamadar) 08 Feb '12

08 Feb '12

Hi, While doing make, I got below errors. Got same build errors for libvirt-0.9.8 and libvirt-0.9.9. Appreciate your help on this. CC libvirt_driver_nwfilter_la-nwfilter_driver.lo CC libvirt_driver_nwfilter_la-nwfilter_gentech_driver.lo CC libvirt_driver_nwfilter_la-nwfilter_ebiptables_driver.lo CC libvirt_driver_nwfilter_la-nwfilter_learnipaddr.lo In file included from /usr/cisco/packages/libpcap/libpcap-1.0.0/include/pcap.h:45, from nwfilter/nwfilter_learnipaddr.c:29: /usr/cisco/packages/libpcap/libpcap-1.0.0/include/pcap/pcap.h:339: warning: redundant redeclaration of 'bpf_filter' [-Wredundant-decls] /usr/cisco/packages/libpcap/libpcap-1.0.0/include/pcap/bpf.h:919: warning: previous declaration of 'bpf_filter' was here /usr/cisco/packages/libpcap/libpcap-1.0.0/include/pcap/pcap.h:340: warning: redundant redeclaration of 'bpf_validate' [-Wredundant-decls] /usr/cisco/packages/libpcap/libpcap-1.0.0/include/pcap/bpf.h:918: warning: previous declaration of 'bpf_validate' was here CCLD libvirt_driver_nwfilter.la libtool: link: require no space between `-L' and `/usr/cisco/packages/libpcap/libpcap-1.0.0/lib' make[3]: *** [libvirt_driver_nwfilter.la] Error 1 make[3]: Leaving directory `/nobackup/vsm/libvirt-0.9.8/src' make[2]: *** [all] Error 2 make[2]: Leaving directory `/nobackup/vsm/libvirt-0.9.8/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/nobackup/vsm/libvirt-0.9.8' make: *** [all] Error 2 [root@blr-vxr-009 libvirt-0.9.8]# Thanks, Chandrashekhar

2 3

[libvirt] [test-API][PATCH] Add new APIs and fix problems in connectAPI
by Wayne Sun 08 Feb '12

08 Feb '12

* add 8 new APIs get_sys_info(self, flag = 0) get_memory_stats(self, cellNum, flag = 0) get_cpu_stats(self, cpuNum, flag = 0) is_alive(self) change_begin(self, flag = 0) change_commit(self, flag = 0) change_rollback(self, flag = 0) suspend_for_duration(self, target, duration, flag = 0) * remove outdated ref(self, uri) function * fix typo in following functions migrate(self, domain, flags, dname, uri, bandwidth) networkLookupByUUID(self, uuid) numOfDefinedDomains(self) numOfDomains(self) nwfilterLookupByUUID(self, uuid) --- lib/connectAPI.py | 83 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 72 insertions(+), 11 deletions(-) diff --git a/lib/connectAPI.py b/lib/connectAPI.py index 9f2b728..87b0a59 100644 --- a/lib/connectAPI.py +++ b/lib/connectAPI.py @@ -105,6 +105,15 @@ class ConnectAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def get_sys_info(self, flag = 0): + try: + sysinfo = self.conn.getSysinfo(flag) + return sysinfo + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def get_type(self): try: type = self.conn.getType() @@ -123,19 +132,18 @@ class ConnectAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def ref(self, uri): + def get_cells_free_memory(self, startCell, maxCells): try: - refer = self.conn.ref() - return refer + cfreemem = self.conn.getCellsFreeMemory(startCell, maxCells) + return cfreemem except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def get_cells_free_memory(self, startCell, maxCells): + def get_memory_stats(self, cellNum, flag = 0): try: - cfreemem = self.conn.getCellsFreeMemory(startCell, maxCells) - return cfreemem + return self.conn.getMemoryStats(cellNum, flag) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -158,6 +166,14 @@ class ConnectAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def get_cpu_stats(self, cpuNum, flag = 0): + try: + return self.conn.getCPUStats(cpuNum, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def compare_cpu(self, xmlDesc, flag = 0): try: return self.conn.compareCPU(xmlDesc, flag) @@ -208,6 +224,14 @@ class ConnectAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def is_alive(self): + try: + return self.conn.isAlive() + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def isEncrypted(self): try: return self.conn.isEncrypted() @@ -307,7 +331,7 @@ class ConnectAPI(object): def migrate(self, domain, flags, dname, uri, bandwidth): try: - return self.migrate(self, domain, flags, dname, uri, bandwidth) + return self.conn.migrate(domain, flags, dname, uri, bandwidth) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -315,7 +339,7 @@ class ConnectAPI(object): def networkLookupByUUID(self, uuid): try: - return self.networkLookupByUUID(self, uuid) + return self.conn.networkLookupByUUID(uuid) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -323,7 +347,7 @@ class ConnectAPI(object): def numOfDefinedDomains(self): try: - return self.numOfDefinedDomains(self) + return self.conn.numOfDefinedDomains() except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -331,7 +355,7 @@ class ConnectAPI(object): def numOfDomains(self): try: - return self.numOfDomains(self) + return self.conn.numOfDomains() except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -339,7 +363,39 @@ class ConnectAPI(object): def nwfilterLookupByUUID(self, uuid): try: - return self.nwfilterLookupByUUID(self, uuid) + return self.conn.nwfilterLookupByUUID(uuid) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def change_begin(self, flag = 0): + try: + return self.conn.changeBegin(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def change_commit(self, flag = 0): + try: + return self.conn.changeCommit(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def change_rollback(self, flag = 0): + try: + return self.conn.changeRollback(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def suspend_for_duration(self, target, duration, flag = 0): + try: + return self.conn.suspendForDuration(target, duration, flag) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -348,3 +404,8 @@ class ConnectAPI(object): VIR_CRED_AUTHNAME = libvirt.VIR_CRED_AUTHNAME VIR_CRED_PASSPHRASE = libvirt.VIR_CRED_PASSPHRASE +# virNodeSuspendTarget +VIR_NODE_SUSPEND_TARGET_MEM = 0 +VIR_NODE_SUSPEND_TARGET_DISK = 1 +VIR_NODE_SUSPEND_TARGET_HYBRID = 2 +VIR_NODE_SUSPEND_TARGET_LAST = 3 -- 1.7.1

2 1

[libvirt] [PATCH] virsh: update virsh desc help docs
by ajia＠redhat.com 08 Feb '12

08 Feb '12

From: Alex Jia <ajia(a)redhat.com> The function cmdDesc says 'current is ignored', so should remove related part from help docs. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index c107d8c..e60ef5a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1038,7 +1038,6 @@ static const vshCmdOptDef opts_desc[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"live", VSH_OT_BOOL, 0, N_("modify/get running state")}, {"config", VSH_OT_BOOL, 0, N_("modify/get persistent configuration")}, - {"current", VSH_OT_BOOL, 0, N_("modify/get current state configuration")}, {"title", VSH_OT_BOOL, 0, N_("modify the title instead of description")}, {"edit", VSH_OT_BOOL, 0, N_("open an editor to modify the description")}, {"new-desc", VSH_OT_ARGV, 0, N_("message")}, -- 1.7.1

2 1

[libvirt] [PATCH] virsh: Plug memory leak on cmdDesc
by ajia＠redhat.com 08 Feb '12

08 Feb '12

From: Alex Jia <ajia(a)redhat.com> Forgot to free the domain object, this will intruduce resource leaks including memory leak and FD leaks. * tools/virsh.c(cmdDesc): fix memory leak. * How to reproduce? % virsh desc <domain> No description for domain: <domain> error: Failed to disconnect from the hypervisor, 1 leaked reference(s) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index bff7d5d..c107d8c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1167,6 +1167,8 @@ cleanup: unlink(tmp); VIR_FREE(tmp); } + if (dom) + virDomainFree(dom); return ret; } -- 1.7.1

3 2

[libvirt] [PATCH v2] virsh: Do not check the input XML at virsh layer for cmdDetachDevice
by Osier Yang 08 Feb '12

08 Feb '12

Any device XML doesn't use the same order as libvirt generates, or uses decimal for attributes like "slot" of "<address>" will cause device detaching to fail, as virsh compares the XML simply earlier in strict manner before internal parsing. This is regression introduced by ea7182c. v1 is here: https://www.redhat.com/archives/libvir-list/2012-January/msg00395.html v1 - v2: * The two useful functions is left unchanged, marked as unused. --- tools/virsh.c | 23 +++++------------------ 1 files changed, 5 insertions(+), 18 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 72ca93a..7997cbb 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13153,6 +13153,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) * @n2 second node * returns true in case n1 covers n2, false otherwise. */ +__attribute__((unused)) static bool vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) { @@ -13278,6 +13279,7 @@ cleanup: * (is too ambiguous), 0 in case of success. Otherwise returns -1. @newXML * is touched only in case of success. */ +__attribute__((unused)) static int vshCompleteXMLFromDomain(vshControl *ctl, virDomainPtr dom, char *oldXML, char **newXML) @@ -13412,7 +13414,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; const char *from = NULL; - char *buffer = NULL, *new_buffer = NULL; + char *buffer = NULL; int ret; bool funcRet = false; unsigned int flags; @@ -13431,27 +13433,13 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - ret = vshCompleteXMLFromDomain(ctl, dom, buffer, &new_buffer); - if (ret < 0) { - if (ret == -2) { - vshError(ctl, _("no such device in %s"), virDomainGetName(dom)); - } else if (ret == -3) { - vshError(ctl, "%s", _("given XML selects too many devices. " - "Please, be more specific")); - } else { - /* vshCompleteXMLFromDomain() already printed error message, - * so nothing to do here. */ - } - goto cleanup; - } - if (vshCommandOptBool(cmd, "persistent")) { flags = VIR_DOMAIN_AFFECT_CONFIG; if (virDomainIsActive(dom) == 1) flags |= VIR_DOMAIN_AFFECT_LIVE; - ret = virDomainDetachDeviceFlags(dom, new_buffer, flags); + ret = virDomainDetachDeviceFlags(dom, buffer, flags); } else { - ret = virDomainDetachDevice(dom, new_buffer); + ret = virDomainDetachDevice(dom, buffer); } if (ret < 0) { @@ -13463,7 +13451,6 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) funcRet = true; cleanup: - VIR_FREE(new_buffer); VIR_FREE(buffer); virDomainFree(dom); return funcRet; -- 1.7.7.3

3 4

[libvirt] [PATCH] build: avoid gcc 4.7 warning about inlines
by Eric Blake 07 Feb '12

07 Feb '12

gcc 4.7 complains: util/virhashcode.c:49:17: error: always_inline function might not be inlinable [-Werror=attributes] util/virhashcode.c:35:17: error: always_inline function might not be inlinable [-Werror=attributes] Normal 'inline' is a hint that the compiler may ignore; the fact that the function is static is good enough. We don't care if the compiler decided not to inline after all. * src/util/virhashcode.c (getblock, fmix): Relax attribute. --- Pushing under the build-breaker rule; this lets the build get further on rawhide (it later fails with: GEN remote/remote_protocol.h /usr/bin/rpcgen: C preprocessor failed with exit code 1 cannot shutdown /usr/bin/rpcgen: at ./rpc/genprotocol.pl line 122. that I still have to investigate). src/util/virhashcode.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/util/virhashcode.c b/src/util/virhashcode.c index 6d91793..d16d544 100644 --- a/src/util/virhashcode.c +++ b/src/util/virhashcode.c @@ -31,8 +31,7 @@ #include "bitrotate.h" /* slower than original but handles platforms that do only aligned reads */ -__attribute__((always_inline)) -static uint32_t getblock(const uint8_t *p, int i) +static inline uint32_t getblock(const uint8_t *p, int i) { uint32_t r; size_t size = sizeof(r); @@ -45,8 +44,7 @@ static uint32_t getblock(const uint8_t *p, int i) /* * Finalization mix - force all bits of a hash block to avalanche */ -__attribute__((always_inline)) -static uint32_t fmix(uint32_t h) +static inline uint32_t fmix(uint32_t h) { h ^= h >> 16; h *= 0x85ebca6b; -- 1.7.7.6

1 2

[libvirt] [PATCH] storage: Don't unsparsify images when cloning
by Cole Robinson 07 Feb '12

07 Feb '12

Input to the volume cloning code is a source volume and an XML descriptor for the new volume. It is possible for the new volume to have a greater size than source volume, at which point libvirt will just stick 0s on the end of the new image (for raw format anyways). Unfortunately a logic error messed up our tracking of the of the excess amount that needed to be written: end result is that sparse clones were made very much non-sparse, and cloning regular disk images could end up excessively sized (though data unaltered). Drop the 'remain' variable entriely here since it's redundant, and track actual allocation directly against the desired 'total'. --- src/storage/storage_backend.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 1c22112..caac2f8 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -127,7 +127,6 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, int inputfd = -1; int amtread = -1; int ret = 0; - unsigned long long remain; size_t rbytes = READ_BLOCK_SIZE_DEFAULT; size_t wbytes = 0; int interval; @@ -165,13 +164,11 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, goto cleanup; } - remain = *total; - while (amtread != 0) { int amtleft; - if (remain < rbytes) - rbytes = remain; + if (*total < rbytes) + rbytes = *total; if ((amtread = saferead(inputfd, buf, rbytes)) < 0) { ret = -errno; @@ -180,7 +177,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, inputvol->target.path); goto cleanup; } - remain -= amtread; + *total -= amtread; /* Loop over amt read in 512 byte increments, looking for sparse * blocks */ @@ -225,8 +222,6 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, } inputfd = -1; - *total -= remain; - cleanup: VIR_FORCE_CLOSE(inputfd); -- 1.7.7.5

2 4

[libvirt] [PATCH] Bug fix: Allow sysinfo to display processor information
by Prerna Saxena 07 Feb '12

07 Feb '12

From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Mon, 6 Feb 2012 13:46:10 +0530 Subject: [PATCH] Bugfix: Allow sysinfo to display 'processor' information Calls to virSysinfoParseBIOS(), virSysinfoParseSystem() would update the buffer pointer 'base', so the processor information would be lost before virSysinfoParseProcessor() was called. Sysinfo would therefore not be able to display processor details -- It only described <bios>, <system> and <memory_device> details. Before the fix: --------------- virsh # sysinfo <sysinfo type='smbios'> <bios> .... </bios> <system> .... </system> <memory_device> .... </memory_device> After the fix: ------------- virsh # sysinfo <sysinfo type='smbios'> <bios> .... </bios> <system> .... </system> <processor> .... </processor> <memory_device> .... </memory_device> --- src/util/sysinfo.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index de3108a..d92d655 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -483,16 +483,17 @@ virSysinfoRead(void) { base = outbuf; + ret->nprocessor = 0; + ret->processor = NULL; + if ((base = virSysinfoParseProcessor(base, ret)) == NULL) + goto no_memory; + if ((base = virSysinfoParseBIOS(base, ret)) == NULL) goto no_memory; if ((base = virSysinfoParseSystem(base, ret)) == NULL) goto no_memory; - ret->nprocessor = 0; - ret->processor = NULL; - if ((base = virSysinfoParseProcessor(base, ret)) == NULL) - goto no_memory; ret->nmemory = 0; ret->memory = NULL; -- 1.7.3.1 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 4

[libvirt] [PATCH 0/2] qemu: Fix stalls during live core dump
by Jiri Denemark 07 Feb '12

07 Feb '12

Qemu uses non-blocking I/O which doesn't play nice with regular file descriptors. We need to pass a pipe to qemu when dumping core to avoid stalls in live mode. Jiri Denemark (2): util: Generalize virFileDirectFd qemu: Always use iohelper for dumping domain core src/qemu/qemu_driver.c | 41 +++++++++++--------- src/util/virfile.c | 98 ++++++++++++++++++++++++++--------------------- src/util/virfile.h | 18 +++++---- 3 files changed, 86 insertions(+), 71 deletions(-) -- 1.7.8.4

2 8

[libvirt] [PATCH v2 0/1] qemu-ga: add guest-sync-delimited
by Michael Roth 07 Feb '12

07 Feb '12

Sorry for the somewhat redundant cover letter, but needed to note that: This applies on top of "[PATCH v2 0/8] qemu-ga: add support for Windows", and can also be obtained from: git://github.com/mdroth/qemu.git qga-guest-sync-delimited CHANGES SINCE v1: - removed deprecation flag for guest-sync, still useful for some implementations As noted in the commit there's a wiki write-up with more details on what exactly this is for: http://wiki.qemu.org/Features/QAPI/GuestAgent#QEMU_Guest_Agent_Protocol It's not absolutely required, but it does make dealing with some communication corner cases a heck of a lot easier for stream-based (as opposed to readline-based) client implementations.

2 4

[libvirt] [PATCH] build: don't require avahi during install
by Laine Stump 07 Feb '12

07 Feb '12

See: https://bugzilla.redhat.com/show_bug.cgi?id=785269 The specfile requires avahi during install if libvirt was built with avahi support, but there are many situations where it is undesirable to install avahi due to security concerns. If we still Build-require avahi-devel during the build, but don't require it at install time, it will be used if present, and ignored if not. --- libvirt.spec.in | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f279d6d..dab9650 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -272,9 +272,6 @@ Requires: %{name}-client = %{version}-%{release} Requires: module-init-tools # for /sbin/ip & /sbin/tc Requires: iproute -%if %{with_avahi} -Requires: avahi -%endif %endif %if %{with_network} Requires: dnsmasq >= 2.41 -- 1.7.7.6

2 4

[libvirt] [PATCH] Allow polkit auth for VNC and SSH users
by Cole Robinson 07 Feb '12

07 Feb '12

If you are sitting in front of a physical machine and logged in as a regular user, you can connect to the system libvirtd instance by providing a root password to policykit. This is how most virt-manager users talk to libvirt. However, if you are launching virt-manager over ssh -X, or over VNC started from say /etc/sysconfig/vncservers, our policykit policy rejects the user outright, providing no option to provide the root password. This is confusing to users and doesn't seem to serve much point. Change the policy to allow inactive (VNC) and non-local (SSH, VNC) to provide root credentials for accessing system libvirtd. We use auth_admin rather than auth_admin_keep so that credentials aren't cached at all, and every subsequent reconnection to libvirt requires auth. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=625115 Similar change to PackageKit policy: https://bugzilla.redhat.com/show_bug.cgi?id=528511 --- daemon/libvirtd.policy-0 | 4 ++-- daemon/libvirtd.policy-1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/libvirtd.policy-0 b/daemon/libvirtd.policy-0 index b6da946..5d6845c 100644 --- a/daemon/libvirtd.policy-0 +++ b/daemon/libvirtd.policy-0 @@ -34,8 +34,8 @@ file are instantly applied. <defaults>  - <allow_any>no</allow_any> - <allow_inactive>no</allow_inactive> + <allow_any>auth_admin</allow_any> + <allow_inactive>auth_admin</allow_inactive> <allow_active>auth_admin_keep_session</allow_active> </defaults> </action> diff --git a/daemon/libvirtd.policy-1 b/daemon/libvirtd.policy-1 index 6fa3a5e..c2bec1f 100644 --- a/daemon/libvirtd.policy-1 +++ b/daemon/libvirtd.policy-1 @@ -34,8 +34,8 @@ file are instantly applied. <defaults>  - <allow_any>no</allow_any> - <allow_inactive>no</allow_inactive> + <allow_any>auth_admin</allow_any> + <allow_inactive>auth_admin</allow_inactive> <allow_active>auth_admin_keep</allow_active> </defaults> </action> -- 1.7.7.5

2 2

[libvirt] [PATCH] qemu_agent: Issue guest-sync prior to every command
by Michal Privoznik 07 Feb '12

07 Feb '12

If we issue guest command and GA is not running, the issuing thread will block endlessly. We can check for GA presence by issuing guest-sync with unique ID (timestamp). We don't want to issue real command as even if GA is not running, once it is started, it process all commands written to GA socket. If we receive reply, it might be from a previous sync command, so we need to compare received ID for equality with the given one. --- Some background on this: -GA socked is always writeable, even with no GA running (!) -writing something to dead socket (=without any GA listening) will thus succeed. However, when one will (after a period of time) start the GA, it will read and process all written data. This makes timeout implementation harder. -Therefore issuing a GA command without any GA running will block indefinitely. My solution to this is: Issue harmless guest-sync command which returns given identifier. To avoid blocking, do a timed wait (5 seconds). This is the only case where we do a timed wait, regular GA commands will of course wait without any timeout. If GA didn't reply within those 5 seconds, we store an ID so we can compare it later and report 'GA unavailable'; Note that guest won't get into a different state as libvirt thinks it is in. Then, if GA is ever started, it start to process our sync commands. And all we have to do is check if we have ever issued such ID. If not an error is reported. However, there is still race: 1) GA will reply to our guest-sync 2) GA gets terminated 3) we issue regular command (e.g. fs-freeze) I am not sure this is avoidable. But this patch makes current situation bearable. src/qemu/qemu_agent.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 159 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 9df5546..5ecf893 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -39,6 +39,7 @@ #include "virterror_internal.h" #include "json.h" #include "virfile.h" +#include "virtime.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -106,6 +107,10 @@ struct _qemuAgent { /* If anything went wrong, this will be fed back * the next monitor msg */ virError lastError; + + /* Array of IDs issued to GA via guest-sync */ + unsigned long long *ids; + size_t ids_size; }; #if DEBUG_RAW_IO @@ -147,6 +152,7 @@ static void qemuAgentFree(qemuAgentPtr mon) (mon->cb->destroy)(mon, mon->vm); ignore_value(virCondDestroy(&mon->notify)); virMutexDestroy(&mon->lock); + VIR_FREE(mon->ids); VIR_FREE(mon->buffer); VIR_FREE(mon); } @@ -316,6 +322,8 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, { virJSONValuePtr obj = NULL; int ret = -1; + size_t i; + unsigned long long id; VIR_DEBUG("Line [%s]", line); @@ -340,6 +348,40 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, obj = NULL; ret = 0; } else { + /* If we've received something like: + * {"return": 1234} + * it is likely that somebody started GA + * which is now processing our previous + * guest-sync command. Check this and if so, + * don't report an error however return silently + */ + if (virJSONValueObjectGetNumberUlong(obj, "return", &id) == 0) { + for (i = 0; i < mon->ids_size; i++) { + if (mon->ids[i] != id) + continue; + + VIR_DEBUG("Received delayed reply to guest-sync: %llu", + id); + + if (mon->ids_size > 1) { + memmove(&mon->ids[i], + &mon->ids[i + 1], + sizeof(*mon->ids) * (mon->ids_size - (i + 1))); + + mon->ids_size--; + if (VIR_REALLOC_N(mon->ids, mon->ids_size) < 0) { + /* Ignore, harmless */ + } + } else { + VIR_FREE(mon->ids); + mon->ids_size = 0; + } + + ret = 0; + goto cleanup; + } + } + qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected JSON reply '%s'"), line); } @@ -813,11 +855,28 @@ void qemuAgentClose(qemuAgentPtr mon) qemuAgentUnlock(mon); } +#define QEMU_AGENT_WAIT_TIME (1000ull * 5) +/** + * qemuAgentSend: + * @mon: Monitor + * @msg: Message + * @timeout: use timeout? + * + * Send @msg to agent @mon. + * Wait max QEMU_AGENT_WAIT_TIME for agent + * to reply. + * + * Returns: 0 on success, + * -2 on timeout, + * -1 otherwise + */ static int qemuAgentSend(qemuAgentPtr mon, - qemuAgentMessagePtr msg) + qemuAgentMessagePtr msg, + bool timeout) { int ret = -1; + unsigned long long now, then; /* Check whether qemu quit unexpectedly */ if (mon->lastError.code != VIR_ERR_OK) { @@ -827,13 +886,26 @@ static int qemuAgentSend(qemuAgentPtr mon, return -1; } + if (timeout) { + if (virTimeMillisNow(&now) < 0) + return -1; + then = now + QEMU_AGENT_WAIT_TIME; + } + mon->msg = msg; qemuAgentUpdateWatch(mon); while (!mon->msg->finished) { - if (virCondWait(&mon->notify, &mon->lock) < 0) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to wait on monitor condition")); + if ((timeout && virCondWaitUntil(&mon->notify, &mon->lock, then) < 0) || + (!timeout && virCondWait(&mon->notify, &mon->lock) < 0)) { + if (errno == ETIMEDOUT) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Guest agent not available for now")); + ret = -2; + } else { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to wait on monitor condition")); + } goto cleanup; } } @@ -855,6 +927,83 @@ cleanup: } +/** + * qemuAgentGuestSync: + * @mon: Monitor + * + * Send guest-sync with unique ID and wait for + * reply. If we get one, check if received ID + * is equal to given. + * + * Returns: 0 on success, + * -1 otherwise + */ +static int +qemuAgentGuestSync(qemuAgentPtr mon) +{ + int ret = -1; + int send_ret; + unsigned long long id, id_ret; + qemuAgentMessage sync_msg; + + memset(&sync_msg, 0, sizeof sync_msg); + + if (virTimeMillisNow(&id) < 0) + return -1; + + if (virAsprintf(&sync_msg.txBuffer, + "{\"execute\":\"guest-sync\", " + "\"arguments\":{\"id\":%llu}}", id) < 0) { + virReportOOMError(); + return -1; + } + sync_msg.txLength = strlen(sync_msg.txBuffer); + + VIR_DEBUG("Sending guest-sync command with ID: %llu", id); + + send_ret = qemuAgentSend(mon, &sync_msg, true); + + VIR_DEBUG("Agent guest-sync returned: %d", send_ret); + + if (send_ret == -1) { + /* error reported */ + goto cleanup; + } else if (send_ret == -2) { + /* don't report errors as we don't want to + * overwrite the one from qemuAgentSend() */ + if (VIR_REALLOC_N(mon->ids, mon->ids_size) == 0) + mon->ids[mon->ids_size++] = id; + goto cleanup; + } + + if (!sync_msg.rxObject) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing monitor reply object")); + goto cleanup; + } + + if (virJSONValueObjectGetNumberUlong(sync_msg.rxObject, + "return", &id_ret) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed return value")); + goto cleanup; + } + + VIR_DEBUG("Guest returned ID: %llu", id_ret); + if (id_ret != id) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("Guest agent returned ID: %llu instead of %llu"), + id_ret, id); + goto cleanup; + } + ret = 0; + +cleanup: + virJSONValueFree(sync_msg.rxObject); + VIR_FREE(sync_msg.txBuffer); + return ret; +} + static int qemuAgentCommand(qemuAgentPtr mon, virJSONValuePtr cmd, @@ -866,6 +1015,11 @@ qemuAgentCommand(qemuAgentPtr mon, *reply = NULL; + if (qemuAgentGuestSync(mon) < 0) { + /* helper reported the error */ + return -1; + } + memset(&msg, 0, sizeof msg); if (!(cmdstr = virJSONValueToString(cmd))) { @@ -880,12 +1034,11 @@ qemuAgentCommand(qemuAgentPtr mon, VIR_DEBUG("Send command '%s' for write", cmdstr); - ret = qemuAgentSend(mon, &msg); + ret = qemuAgentSend(mon, &msg, false); VIR_DEBUG("Receive command reply ret=%d rxObject=%p", ret, msg.rxObject); - if (ret == 0) { if (!msg.rxObject) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.7.3.4

3 3

[libvirt] [PATCH 0/1] qemu-ga: add guest-sync-delimited
by Michael Roth 07 Feb '12

07 Feb '12

Sorry for the somewhat redundant cover letter, but needed to note that: This applies on top of "[PATCH v2 0/8] qemu-ga: add support for Windows", and can also be obtained from: git://github.com/mdroth/qemu.git qga-guest-sync-delimited As noted in the commit there's a wiki write-up with more details on what exactly this is for: http://wiki.qemu.org/Features/QAPI/GuestAgent#QEMU_Guest_Agent_Protocol It's not absolutely required, but it does make dealing with some communication corner cases a heck of a lot easier.

2 3

[libvirt] [PATCH] pyhton: Don't link against libvirt_util.la
by Michal Privoznik 07 Feb '12

07 Feb '12

As we already link with libvirt.la which contains libvirt_utils.la. Double linking causes global symbols to be presented twice and thus confusion. This partially reverts c700613b8d463212d142c97108b7a2352e23e559 --- python/Makefile.am | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am index 9b791d7..0305bcc 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -41,11 +41,9 @@ EXTRA_DIST = \ if WITH_PYTHON mylibs = \ $(top_builddir)/src/libvirt.la \ - $(top_builddir)/src/libvirt_util.la \ $(top_builddir)/gnulib/lib/libgnu.la myqemulibs = \ $(top_builddir)/src/libvirt-qemu.la \ - $(top_builddir)/src/libvirt_util.la \ $(top_builddir)/gnulib/lib/libgnu.la all-local: libvirt.py libvirt_qemu.py -- 1.7.3.4

3 3

[libvirt] [PATCH] libvirtd: Enable private /tmp under systemd.
by Eric Blake 07 Feb '12

07 Feb '12

The last intentional use of /tmp by libvirt was patched in commit bd6083c9b; we can add an extra measure of security by explicitly requesting that libvirtd's /tmp is not visible to arbitrary users. See https://bugzilla.redhat.com/782474 * daemon/libvirtd.service.in (Service): Enable PrivateTmp. --- daemon/libvirtd.service.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index 8f2458a..cf68440 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -17,6 +17,7 @@ ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS ExecReload=/bin/kill -HUP $MAINPID # Override the maximum number of opened files #LimitNOFILE=2048 +PrivateTmp=true [Install] WantedBy=multi-user.target -- 1.7.7.6

2 2

[libvirt] [RFC] Specific vcpu hot-(un)plug API proposal
by Peter Krempa 07 Feb '12

07 Feb '12

Hypervisors are starting to support hot-(un)plugging of specific vcpus. This adds more flexibility for the management tools to decide which CPU should be added or removed. Libvirt's API in current state does not allow to choose arbitrary vCPU id's for the new vCPU's and does not support removing arbitrary vCPUs either. I propose a following API to enable working with specific vCPUs: /** * virDomainAddVcpu: * @domain: pointer to domain object * @vcpu: ID of the vcpu socket to plug the virtual CPU to * @flags: bitwise-OR of virDomainModificationImpact * * Dynamicaly add a CPU to the domain. Attach the cpu to the ID specified * by @vcpu. Note that this call may fail if the underlying virtualization * hypervisor does not support adding cpu's with specific ID or if maximum * number of CPUs is arbitrary limited. * * The @vcpu parameter identifies the vcpu ID the new vcpu should be attached * to. If -1 is specified, the new cpu is added to the first available ID. * * @flags may include VIR_DOMAIN_AFFECT_LIVE to affect a running * domain (which may fail if domain is not active), or * VIR_DOMAIN_AFFECT_CONFIG to affect the next boot via the XML * description of the domain. Both flags may be set. * If neither flag is specified (that is, @flags is VIR_DOMAIN_AFFECT_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. * * Returns 0 in case of success, -1 in case of failure. */ int virDomainAddVcpu(virDomainPtr domain, int vcpu, unsigned int flags) /** * virDomainRemoveVcpu: * @domain: pointer to domain object * @vcpu: ID of the vcpu socket to plug the virtual CPU to * @flags: bitwise-OR of virDomainModificationImpact * * Dynamicaly remove a CPU from the domain. Remove the the vcpu with ID * specified by @vcpu. Note that this call may fail if the underlying * virtualization hypervisor does not support hot-unplugging vcpus with * specific ID or vcpus in general. * * The @vcpu parameter identifies the vcpu ID that should be removed. * If -1 is specified, the cpu with the highest ID is removed. * * @flags may include VIR_DOMAIN_AFFECT_LIVE to affect a running * domain (which may fail if domain is not active), or * VIR_DOMAIN_AFFECT_CONFIG to affect the next boot via the XML * description of the domain. Both flags may be set. * If neither flag is specified (that is, @flags is VIR_DOMAIN_AFFECT_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. * * Returns 0 in case of success, -1 in case of failure. */ int virDomainRemoveVcpu(virDomainPtr domain, int vcpu, unsigned int flags) What are your thoughts on this? Thanks Peter

3 2

[libvirt] segment fault from libvirtmod
by Guannan Ren 07 Feb '12

07 Feb '12

Hi, The Makefile.am in python forget to add probes.o if WITH_DTRACE but after I added it and tried to connect, using libvirt.open("qemu:///system") in python , it reported: "segment fault" I tried to figure out, but failed. If anyone can help this, thanks. The following is the backtrace: #0 0x0000003c62a810a4 in free () from /lib64/libc.so.6 #1 0x00007ffff1836f29 in virFree (ptrptr=0x6a6a28) at util/memory.c:310 #2 0x00007ffff1849692 in virResetError (err=0x6a6a20) at util/virterror.c:387 #3 0x00007ffff13e2761 in do_open (name=0x7ffff7ed6444 "qemu:///system", auth=0x0, flags=0) at libvirt.c:1093 #4 0x00007ffff13e4d44 in virConnectOpen (name=0x7ffff7ed6444 "qemu:///system") at libvirt.c:1350 #5 0x00007ffff1824879 in libvirt_virConnectOpen (self=<optimized out>, args=<optimized out>) at libvirt.c:3637 #6 0x0000003c652dffbb in PyEval_EvalFrameEx () from /usr/lib64/libpython2.7.so.1.0 #7 0x0000003c652e0580 in PyEval_EvalFrameEx () from /usr/lib64/libpython2.7.so.1.0 #8 0x0000003c652e15a5 in PyEval_EvalCodeEx () from /usr/lib64/libpython2.7.so.1.0 #9 0x0000003c652e16d2 in PyEval_EvalCode () from /usr/lib64/libpython2.7.so.1.0 #10 0x0000003c652fb9ec in ?? () from /usr/lib64/libpython2.7.so.1.0 #11 0x0000003c652fc7f0 in PyRun_FileExFlags () from /usr/lib64/libpython2.7.so.1.0 #12 0x0000003c652fd26f in PyRun_SimpleFileExFlags () from /usr/lib64/libpython2.7.so.1.0 #13 0x0000003c6530e745 in Py_Main () from /usr/lib64/libpython2.7.so.1.0 #14 0x0000003c62a2169d in __libc_start_main () from /lib64/libc.so.6 #15 0x0000000000400651 in _start () Guannan Ren

4 6

[libvirt] [test-API][PATCH] Add 8 new APIs in domainAPI
by Wayne Sun 07 Feb '12

07 Feb '12

* new APIs reset(self, domname, flag = 0) get_vcpu_pin_info(self, domname, flag) is_updated(self, domname) inject_NMI(self, domname, flag = 0) open_console(self, domname, dev_name, stream, flag = 0) open_graphics(self, domname, idx, fd, flag = 1) screenshot(self, domname, stream, screen, flag = 0) get_migrate_max_speed(self, domname, flag = 0) A bug is filed to migrateGetMaxSpeed() about parameters, it'll affect get_migrate_max_speed() function, but the parameters should remain the status quo. Change will be followed up anyway. open_graphics() will not work now for lack qemu support, missing add_client qemu command. for dev_name in open_console, pass the alias name of console, serial or parallel port. * deleted outdated function get_ref(self, domname) --- lib/domainAPI.py | 91 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 83 insertions(+), 8 deletions(-) diff --git a/lib/domainAPI.py b/lib/domainAPI.py index 91f2ba3..a8086ab 100644 --- a/lib/domainAPI.py +++ b/lib/domainAPI.py @@ -261,6 +261,16 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def reset(self, domname, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + retval = dom_obj.reset(flag) + return retval + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def get_info(self, domname): try: dom_obj = self.get_domain_by_name(domname) @@ -335,36 +345,46 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def get_ref(self, domname): + def get_vcpus(self, domname): try: dom_obj = self.get_domain_by_name(domname) - ref = dom_obj.ref() - return ref + vcpu_info = dom_obj.vcpus() + return vcpu_info except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def get_vcpus(self, domname): + def set_pin_vcpu(self, domname, vcpu, cpumap): try: dom_obj = self.get_domain_by_name(domname) - vcpu_info = dom_obj.vcpus() - return vcpu_info + pin_vcpu = dom_obj.pinVcpu(vcpu, cpumap) + return pin_vcpu except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def set_pin_vcpu(self, domname, vcpu, cpumap): + def set_pin_vcpu_flags(self, domname, vcpu, cpumap, flag): try: dom_obj = self.get_domain_by_name(domname) - pin_vcpu = dom_obj.pinVcpu(vcpu, cpumap) + pin_vcpu = dom_obj.pinVcpuFlags(vcpu, cpumap, flag) return pin_vcpu except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def get_vcpu_pin_info(self, domname, flag): + try: + dom_obj = self.get_domain_by_name(domname) + pin_vcpu_info = dom_obj.vcpuPinInfo(flag) + return pin_vcpu_info + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def get_uuid(self, domname): try: dom_obj = self.get_domain_by_name(domname) @@ -716,6 +736,15 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def is_updated(self, domname): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.isUpdated() + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def job_info(self, domname): try: dom_obj = self.get_domain_by_name(domname) @@ -878,6 +907,50 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def inject_NMI(self, domname, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.injectNMI(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def open_console(self, domname, dev_name, stream, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.openConsole(dev_name, stream, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def open_graphics(self, domname, idx, fd, flag = 1): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.openGraphics(idx, fd, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def screenshot(self, domname, stream, screen, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.screenshot(stream, screen, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def get_migrate_max_speed(self, domname, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.migrateGetMaxSpeed(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) # DomainState VIR_DOMAIN_NOSTATE = 0 @@ -903,3 +976,5 @@ VIR_DOMAIN_AFFECT_CURRENT = 0 VIR_DOMAIN_AFFECT_LIVE = 1 VIR_DOMAIN_AFFECT_CONFIG = 2 +# virDomainOpenGraphicsFlags +VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH = 1 -- 1.7.1

1 0

[libvirt] [test-API][PATCH v2 2/2] Add and update functions in streamAPI
by Wayne Sun 07 Feb '12

07 Feb '12

* accpet connection object and stream flag as parameter in __init__ remove connect function for connction is given in as parameter. * remove newStream() from each function create new stream object in __init__. function also need flags parameter. * Add 5 new functions screenshot(self, domain, screen, flags = 0) download(self, vol, offset, length, flags = 0) upload(self, vol, offset, length, flags = 0) recvAll(self, handler, opaque) sendAll(self, handler, opaque) for recvAll and sendAll, handler is a user defined function which write/read data to/from file. --- lib/streamAPI.py | 75 ++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 50 insertions(+), 25 deletions(-) diff --git a/lib/streamAPI.py b/lib/streamAPI.py index bc7d217..4da57ca 100644 --- a/lib/streamAPI.py +++ b/lib/streamAPI.py @@ -38,76 +38,101 @@ append_path(result.group(0)) import exception class StreamAPI(object): - def __init__(self, connection): + def __init__(self, connection, flag = 0): self.conn = connection + self.stream_obj = self.conn.newStream(flag) - def abort(self, flag = 0): + def abort(self): try: - stream_obj = newStream(flag) - return stream_obj.abort() + return self.stream_obj.abort() except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def connect(self, flag = 0): + def finish(self): try: - stream_obj = newStream(flag) - return stream_obj.connect() + return self.stream_obj.finish() except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def finish(self, flag = 0): + def recv(self, nbytes): try: - stream_obj = newStream(flag) - return stream_obj.finish() + return self.stream_obj.recv(nbytes) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def recv(self, flag = 0, data, nbytes): + def send(self, data): try: - stream_obj = newStream(flag) - return stream_obj.recv(data, nbytes) + return self.stream_obj.send(data) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def send(self, flag = 0, data, nbytes): + def eventAddCallback(self, cb, opaque): try: - stream_obj = newStream(flag) - return stream_obj.send(data, nbytes) + return self.stream_obj.eventAddCallback(cb, opaque) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def eventAddCallback(self, flag = 0, cb, opaque): + def eventRemoveCallback(self): try: - stream_obj = newStream(flag) - return stream_obj.eventAddCallback(cb, opaque) + return self.stream_obj.eventRemoveCallback() except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def eventRemoveCallback(self, flag = 0): + def eventUpdateCallback(self, events): try: - stream_obj = newStream(flag) - return stream_obj.eventRemoveCallback() + return self.stream_obj.eventUpdateCallback(events) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def eventUpdateCallback(self, flag = 0, events) + def screenshot(self, domain, screen, flags = 0): try: - stream_obj = newStream(flag) - return stream_obj.eventUpdateCallback(events) + return self.stream_obj.screenshot(domain, screen, flags) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def download(self, vol, offset, length, flags = 0): + try: + return self.stream_obj.download(vol, offset, length, flags) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def upload(self, vol, offset, length, flags = 0): + try: + return self.stream_obj.upload(vol, offset, length, flags) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def recvAll(self, handler, opaque): + try: + return self.stream_obj.recvAll(handler, opaque) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def sendAll(self, handler, opaque): + try: + return self.stream_obj.sendAll(handler, opaque) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() -- 1.7.1

2 1

[libvirt] [PATCH 1/1] Clarify the purpose of domxml-from-native (v2)
by Dave Allan 07 Feb '12

07 Feb '12

Someone mentioned to me that they interpreted this section of the KVM driver page as suggesting that new guests should be created by creating a qemu commandline and converting it to XML with domxml-from-native. I don't think that's the intent of domxml-from-native, so I added that clarification. v2 Suggstion from eblake: Add link to the applications page --- docs/drvqemu.html.in | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index fa5496c..fc76829 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -432,9 +432,16 @@ mount -t cgroup none /dev/cgroup -o devices <h3><a name="xmlimport">Converting from QEMU args to domain XML</a></h3> <p> - The <code>virsh domxml-from-native</code> provides a way to convert an - existing set of QEMU args into a guest description using libvirt Domain XML - that can then be used by libvirt. + The <code>virsh domxml-from-native</code> provides a way to + convert an existing set of QEMU args into a guest description + using libvirt Domain XML that can then be used by libvirt. + Please note that this command is intended to be used to convert + existing qemu guests previously started from the command line to + be managed through libvirt. It should not be used a method of + creating new guests from scratch. New guests should be created + using an application calling the libvirt APIs (see + the <a href="apps.html">libvirt applications page</a> for some + examples) or by manually crafting XML to pass to virsh. </p> <pre>$ cat > demo.args <<EOF -- 1.7.7.6

2 2

[libvirt] [PATCH] xen-xm: SIGSEGV in xenXMDomainDefineXML: filename
by Philipp Hahn 06 Feb '12

06 Feb '12

filename is not initialized to NULL while it's unconditionally freed in the error path. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xen/xm_internal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 3cb315a..5acac8b 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1070,7 +1070,7 @@ int xenXMDomainCreate(virDomainPtr domain) { virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) { virDomainPtr ret; - char *filename; + char *filename = NULL; const char *oldfilename; virDomainDefPtr def = NULL; virConfPtr conf = NULL; -- 1.7.1

2 1

[libvirt] [PATCH] xen-xm: fix data loss in domain edit
by Philipp Hahn 06 Feb '12

06 Feb '12

On CentOS5: If "virsh edit $DOM" is used and an error happens (for example changing any live cycle action to a non-existing value), libvirt forgets that $DOM exists, since it is already removed from the internal hash tables, which are used for domain lookup. In once case (unreproducible) even the persistent configuration /etc/xen/$DOM was deleted. Instead of using the compound function xenXMConfigSaveFile() explicitly use xenFomatXM() and virConfWriteFile() to distinguish between a failure in converting the libvirt definition to the xen-xm format and a problem when writing the file. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xen/xm_internal.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 02a0e1d..3cb315a 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1073,6 +1073,7 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) char *filename; const char *oldfilename; virDomainDefPtr def = NULL; + virConfPtr conf = NULL; xenXMConfCachePtr entry = NULL; xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; @@ -1101,6 +1102,9 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) return (NULL); } + if (!(conf = xenFormatXM(conn, def, priv->xendConfigVersion))) + goto error; + /* * check that if there is another domain defined with the same uuid * it has the same name @@ -1156,7 +1160,7 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) if (!(filename = virFileBuildPath(priv->configDir, def->name, NULL))) goto error; - if (xenXMConfigSaveFile(conn, filename, def) < 0) + if (virConfWriteFile(filename, conf) < 0) goto error; if (VIR_ALLOC(entry) < 0) { @@ -1199,6 +1203,7 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) if (entry) VIR_FREE(entry->filename); VIR_FREE(entry); + virConfFree(conf); virDomainDefFree(def); xenUnifiedUnlock(priv); return (NULL); -- 1.7.1

2 1

[libvirt] [PATCH 1/1] Clarify the purpose of domxml-from-native
by Dave Allan 06 Feb '12

06 Feb '12

Someone mentioned to me that they interpreted this section of the KVM driver page as suggesting that new guests should be created by creating a qemu commandline and converting it to XML with domxml-from-native. I don't think that's the intent of domxml-from-native, so I added that clarification. --- docs/drvqemu.html.in | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index fa5496c..09c4f95 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -432,9 +432,15 @@ mount -t cgroup none /dev/cgroup -o devices <h3><a name="xmlimport">Converting from QEMU args to domain XML</a></h3> <p> - The <code>virsh domxml-from-native</code> provides a way to convert an - existing set of QEMU args into a guest description using libvirt Domain XML - that can then be used by libvirt. + The <code>virsh domxml-from-native</code> provides a way to + convert an existing set of QEMU args into a guest description + using libvirt Domain XML that can then be used by libvirt. + Please note that this command is intended to be used to convert + existing qemu guests previously started from the command line to + be managed through libvirt. It should not be used a method of + creating new guests from scratch. New guests should be created + using an application calling the libvirt APIs or by manually + crafting XML to pass to virsh. </p> <pre>$ cat > demo.args <<EOF -- 1.7.7.6

2 1

[libvirt] [PATCH v2 0/5] Introduce sVirt to LXC driver
by Daniel P. Berrange 06 Feb '12

06 Feb '12

This is an update of https://www.redhat.com/archives/libvir-list/2012-January/msg00418.html Changes since v1: - Pushed the first 2 patches which passed review - Update to include all Eric's suggested changes - Rebase to latest GIT master

3 19

[libvirt] [RFC PATCH V2] Add proxy FS support to libvirt
by M. Mohan Kumar 06 Feb '12

06 Feb '12

From: "M. Mohan Kumar" <mohan(a)in.ibm.com> A new FS driver type 'proxy' is added to QEMU 9p server. This patch adds support for using proxy FS driver from libvirt. QEMU proxy FS driver uses socket for communicating between helper and qemu proxy FS driver. Proxy helper (a stand alone binary part of qemu) is invoked with one of the descriptors created using socketpair call and the share path. Similarly QEMU is invoked with another descriptor created using the same socketpair system call and with other required FS driver parameters. Need for proxy FS driver ======================== Pass through security model in QEMU 9p server has following issues: 1) TOCTTOU vulnerability: Following symbolic links in the server could provide access to files beyond 9p export path. 2) Running QEMU with root privilege could be a security issue (pass through security model needs root privilege). Proxy FS driver is implemented to solve these issues. Proxy FS uses chroot + socket combination for securing the vulnerability known with following symbolic links. Intention of adding a new filesystem type is to allow qemu to run in non-root mode, but doing privileged operations in a chroot environment using socket IO. Proxy helper is invoked with root privileges and chroots into 9p export path. QEMU proxy fs driver sends filesystem request to proxy helper and receives the response from it. Proxy helper is designed such a way that it needs only few capabilities related to filesystem operations (such as CAP_DAC_OVERRIDE, CAP_FOWNER, etc) and all other capabilities are dropped (CAP_SYS_CHROOT, etc) Proxy patches http://permalink.gmane.org/gmane.comp.emulators.qemu/128735 Signed-off-by: M. Mohan Kumar <mohan(a)in.ibm.com> --- Changes from previous version * Remove the xml node for specifying the virtfs-proxy-helper, now it is determined from qemu binary. docs/formatdomain.html.in | 3 +- src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 2 +- src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 71 ++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_command.h | 3 +- tests/qemuhelptest.c | 3 +- 8 files changed, 81 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 18b7e22..e398779 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1336,7 +1336,8 @@ This mode also has an optional sub-element <code>driver</code>, with an attribute <code>type='path'</code> - or <code>type='handle'</code> <span class="since">(since + or <code>type='handle'</code> + or <code>type='proxy'</code> <span class="since">(since 0.9.7)</span>. </dd> <dt><code>type='template'</code></dt> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0190a81..2d45324 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -250,7 +250,8 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, VIR_ENUM_IMPL(virDomainFSDriverType, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "default", "path", - "handle") + "handle", + "proxy") VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "passthrough", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 03aa5b6..3796da4 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -466,6 +466,7 @@ enum virDomainFSDriverType { VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT = 0, VIR_DOMAIN_FS_DRIVER_TYPE_PATH, VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE, + VIR_DOMAIN_FS_DRIVER_TYPE_PROXY, VIR_DOMAIN_FS_DRIVER_TYPE_LAST }; @@ -491,7 +492,6 @@ struct _virDomainFSDef { virDomainDeviceInfo info; }; - /* 5 different types of networking config */ enum virDomainNetType { VIR_DOMAIN_NET_TYPE_USER, diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 43c7578..9c01a3b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -144,6 +144,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "ich9-ahci", "no-acpi", "fsdev-readonly", + "fsdev-proxy", ); struct qemu_feature_flags { @@ -1083,6 +1084,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_FSDEV); if (strstr(fsdev, "readonly")) qemuCapsSet(flags, QEMU_CAPS_FSDEV_READONLY); + if (strstr(fsdev, "sock_fd")) + qemuCapsSet(flags, QEMU_CAPS_FSDEV_PROXY); } if (strstr(help, "-smbios type")) qemuCapsSet(flags, QEMU_CAPS_SMBIOS_TYPE); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c759baf..e129e35 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -117,6 +117,7 @@ enum qemuCapsFlags { QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ QEMU_CAPS_FSDEV_READONLY =79, /* -fsdev readonly supported */ + QEMU_CAPS_FSDEV_PROXY = 80, /* -fsdev proxy supported */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f2e9cfa..0c79340 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -44,6 +44,7 @@ #include <sys/utsname.h> #include <sys/stat.h> #include <fcntl.h> +#include <libgen.h> #define VIR_FROM_THIS VIR_FROM_QEMU @@ -106,7 +107,8 @@ VIR_ENUM_DECL(qemuDomainFSDriver) VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "local", "local", - "handle"); + "handle", + "proxy"); static void @@ -2080,9 +2082,43 @@ error: return NULL; } +/* + * Invokes the Proxy Helper with one of the socketpair as its parameter + * + */ +static int qemuInvokeProxyHelper(const char *emulator, int sock, const char *path) +{ +#define HELPER "virtfs-proxy-helper" + int ret_val, status; + virCommandPtr cmd; + char *helper, *dname; + + dname = dirname(strdup(emulator)); + if (virAsprintf(&helper, "%s/%s", dname, HELPER) < 0) { + VIR_FREE(dname); + virReportOOMError(); + return -1; + } + + cmd = virCommandNewArgList(helper, NULL); + virCommandAddArg(cmd, "-f"); + virCommandAddArgFormat(cmd, "%d", sock); + virCommandAddArg(cmd, "-p"); + virCommandAddArgFormat(cmd, "%s", path); + virCommandTransferFD(cmd, sock); + virCommandDaemonize(cmd); + ret_val = virCommandRun(cmd, &status); + if (ret_val < 0) + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("%s can't execute"), helper); + virCommandFree(cmd); + VIR_FREE(helper); + VIR_FREE(dname); + return ret_val; +} char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps ATTRIBUTE_UNUSED) + virBitmapPtr qemuCaps ATTRIBUTE_UNUSED, int qemuSocket) { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver); @@ -2108,6 +2144,10 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, virBufferAddLit(&opt, ",security_model=none"); } virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) + virBufferAsprintf(&opt, ",sock_fd=%d", qemuSocket); + virBufferAsprintf(&opt, ",path=%s", fs->src); if (fs->readonly) { @@ -4426,10 +4466,35 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV)) { for (i = 0 ; i < def->nfss ; i++) { char *optstr; + int sockets[2] = {-1, -1}; virDomainFSDefPtr fs = def->fss[i]; + /* + * If its a proxy FS, we need to create a socket pair + * and invoke proxy_helper + */ + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV_PROXY) < 0) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("proxy helper not supported")); + goto error; + } + /* create a socket pair */ + if (socketpair(PF_UNIX, SOCK_STREAM, 0, sockets) < 0) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("socketpair failed")); + goto error; + } + virCommandTransferFD(cmd, sockets[1]); + if (qemuInvokeProxyHelper(def->emulator, sockets[0], + fs->src) < 0) { + VIR_FORCE_CLOSE(sockets[0]); + VIR_FORCE_CLOSE(sockets[1]); + goto error; + } + } virCommandAddArg(cmd, "-fsdev"); - if (!(optstr = qemuBuildFSStr(fs, qemuCaps))) + if (!(optstr = qemuBuildFSStr(fs, qemuCaps, sockets[1]))) goto error; virCommandAddArg(cmd, optstr); VIR_FREE(optstr); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index de61cf3..8e4f335 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -87,7 +87,8 @@ char *qemuBuildDriveStr(virConnectPtr conn, bool bootable, virBitmapPtr qemuCaps); char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps); + virBitmapPtr qemuCaps, + int qemuSocket); /* Current, best practice */ char * qemuBuildDriveDevStr(virDomainDiskDefPtr disk, diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 60155e7..455a7e1 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -648,7 +648,8 @@ mymain(void) QEMU_CAPS_PCI_ROMBAR, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_NO_ACPI, - QEMU_CAPS_FSDEV_READONLY); + QEMU_CAPS_FSDEV_READONLY, + QEMU_CAPS_FSDEV_PROXY); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.6

1 1

[libvirt] [PATCH] maint: Add test output files to .gitignore
by Peter Krempa 06 Feb '12

06 Feb '12

Commit 8f00276c8a6140cec6a6d50441c802981d329c0c consolidated other .gitignore files to the master one, but forgot to add some test output files. --- Detected by git status on a cleaned repo with make check done: # On branch master # Untracked files: # (use "git add <file>..." to include in what will be committed) # # tests/commandtest # tests/virtimetest .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 3e85e4d..b7561dc 100644 --- a/.gitignore +++ b/.gitignore @@ -111,6 +111,7 @@ /tests/*.pid /tests/*xml2*test /tests/commandhelper +/tests/commandtest /tests/conftest /tests/cputest /tests/domainsnapshotxml2xmltest @@ -142,6 +143,7 @@ /tests/virhashtest /tests/virnet*test /tests/virshtest +/tests/virtimetest /tests/vmx2xmltest /tests/xencapstest /tests/xmconfigtest -- 1.7.3.4

2 2

[libvirt] [PATCH] Update myself in AUTHORS
by ajia＠redhat.com 06 Feb '12

06 Feb '12

From: Alex Jia <ajia(a)redhat.com> Move myself from 'Previous maintainers' section to 'the primary maintainers and people with commit access rights' section, because I have a commit right now. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- AUTHORS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AUTHORS b/AUTHORS index ee510ab..578a377 100644 --- a/AUTHORS +++ b/AUTHORS @@ -30,6 +30,7 @@ The primary maintainers and people with commit access rights: Michal Prívozník <mprivozn(a)redhat.com> Peter Krempa <pkrempa(a)redhat.com> Christophe Fergeau <cfergeau(a)redhat.com> + Alex Jia <ajia(a)redhat.com> Previous maintainers: Karel Zak <kzak(a)redhat.com> @@ -182,7 +183,6 @@ Patches have also been contributed by: Guannan Ren <gren(a)redhat.com> John Williams <john.williams(a)petalogix.com> Michael Santos <michael.santos(a)gmail.com> - Alex Jia <ajia(a)redhat.com> Oskari Saarenmaa <os(a)ohmu.fi> Nan Zhang <nzhang(a)redhat.com> Wieland Hoffmann <themineo(a)googlemail.com> -- 1.7.1

3 3

[libvirt] Are they reasonable FD leaks?
by Alex Jia 06 Feb '12

06 Feb '12

Hi all, I met some FD leaks when I tried the following scenario: % dd if=/dev/null of=/var/lib/libvirt/images/foo bs=1 count=1 seek=10M % virsh define foo.xml (disk source file points to '/var/lib/libvirt/images/foo') % virsh vol-clone foo foo-clone default (the original guest name is 'foo') % virsh pool-refresh default % virsh vol-list default (make sure 'foo-clone' volume exists) % virsh define foo-clone.xml (disk source file points to '/var/lib/libvirt/images/foo-clone') % valgrind -v --track-fds=yes virsh undefine foo-clone --remove-all-storage <snip> ==21003== FILE DESCRIPTORS: 10 open at exit. ==21003== Open file descriptor 9: ==21003== at 0x39CF0D8BB7: pipe2 (in /lib64/libc-2.12.so) ==21003== by 0x4E4FC97: rpl_pipe2 (pipe2.c:59) ==21003== by 0x4D5C3FA: virNetClientNew (virnetclient.c:278) ==21003== by 0x4D5C7B2: virNetClientNewUNIX (virnetclient.c:352) ==21003== by 0x4D47EAA: doRemoteOpen (remote_driver.c:601) ==21003== by 0x4D499AF: remoteOpen (remote_driver.c:873) ==21003== by 0x4D12D23: do_open (libvirt.c:1196) ==21003== by 0x4D13EE5: virConnectOpenAuth (libvirt.c:1422) ==21003== by 0x415040: vshReconnect (virsh.c:637) ==21003== by 0x4152A7: vshCommandRun (virsh.c:17688) ==21003== by 0x4264D3: main (virsh.c:19270) ==21003== ==21003== Open file descriptor 8: ==21003== at 0x39CF0D8BB7: pipe2 (in /lib64/libc-2.12.so) ==21003== by 0x4E4FC97: rpl_pipe2 (pipe2.c:59) ==21003== by 0x4D5C3FA: virNetClientNew (virnetclient.c:278) ==21003== by 0x4D5C7B2: virNetClientNewUNIX (virnetclient.c:352) ==21003== by 0x4D47EAA: doRemoteOpen (remote_driver.c:601) ==21003== by 0x4D499AF: remoteOpen (remote_driver.c:873) ==21003== by 0x4D12D23: do_open (libvirt.c:1196) ==21003== by 0x4D13EE5: virConnectOpenAuth (libvirt.c:1422) ==21003== by 0x415040: vshReconnect (virsh.c:637) ==21003== by 0x4152A7: vshCommandRun (virsh.c:17688) ==21003== by 0x4264D3: main (virsh.c:19270) ==21003== ==21003== Open AF_UNIX socket 7: <unknown> ==21003== at 0x39CF0E67B7: socket (in /lib64/libc-2.12.so) ==21003== by 0x4D6B0F0: virNetSocketNewConnectUNIX (virnetsocket.c:490) ==21003== by 0x4D5C79F: virNetClientNewUNIX (virnetclient.c:349) ==21003== by 0x4D47EAA: doRemoteOpen (remote_driver.c:601) ==21003== by 0x4D499AF: remoteOpen (remote_driver.c:873) ==21003== by 0x4D12D23: do_open (libvirt.c:1196) ==21003== by 0x4D13EE5: virConnectOpenAuth (libvirt.c:1422) ==21003== by 0x415040: vshReconnect (virsh.c:637) ==21003== by 0x4152A7: vshCommandRun (virsh.c:17688) ==21003== by 0x4264D3: main (virsh.c:19270) </snip> It seems libvirt deliberately leaks these FDs, right? Regards, Alex

3 4

[libvirt] [PATCH] virsh: Fix resource leak while listing inactive domains with titles
by Peter Krempa 06 Feb '12

06 Feb '12

Commit fad5cd210899dfde4afe36712754dc921c3f3051 introduces a new flag that allows to show domain's title with domains. This commit introduced resource leak while listing inactive domains with titles. --- Sadly, I missed this even when it was incorrectly intended. :( (extra context for easier review) tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1613d2e..d6fe680 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1000,34 +1000,34 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if (desc) { if (!(title = vshGetDomainDescription(ctl, dom, true, 0))) goto cleanup; vshPrint(ctl, "%-5s %-30s %-10s %s\n", "-", names[i], state == -2 ? _("saved") : _(vshDomainStateToString(state)), title); VIR_FREE(title); } else { vshPrint(ctl, " %-5s %-30s %s\n", "-", names[i], state == -2 ? _("saved") : _(vshDomainStateToString(state))); + } virDomainFree(dom); VIR_FREE(names[i]); - } } ret = true; cleanup: VIR_FREE(ids); VIR_FREE(names); return ret; } /* * "desc" command for managing domain description and title */ static const vshCmdInfo info_desc[] = { {"help", N_("show or set domain's description or title")}, {"desc", N_("Allows to show or modify description or title of a domain.")}, -- 1.7.3.4

2 2

[libvirt] [libvirt-glib 1/7] Fix gvir_config_object_new_from_xml error reporting
by Christophe Fergeau 06 Feb '12

06 Feb '12

It's currently failing to report parsing errors if the passed in error is NULL. --- libvirt-gconfig/libvirt-gconfig-object.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 2e28208..7e3cb88 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -636,10 +636,13 @@ GVirConfigObject *gvir_config_object_new_from_xml(GType type, GVirConfigObject *object; GVirConfigXmlDoc *doc; xmlNodePtr node; + GError *tmp_error = NULL; - node = gvir_config_xml_parse(xml, root_name, error); - if ((error != NULL) && (*error != NULL)) + node = gvir_config_xml_parse(xml, root_name, &tmp_error); + if (tmp_error != NULL) { + g_propagate_error(error, tmp_error); return NULL; + } doc = gvir_config_xml_doc_new(node->doc); object = GVIR_CONFIG_OBJECT(g_object_new(type, "doc", doc, -- 1.7.7.6

2 15

[libvirt] [PATCH] xen_xm: Fix SIGSEGV in xenXMDomainDefineXML
by Philipp Hahn 06 Feb '12

06 Feb '12

On CentOS5 with xen-3.0.3: Program received signal SIGSEGV, Segmentation fault. virFree (ptrptr=0x8) at util/memory.c:310 310 free(*(void**)ptrptr); (gdb) bt #0 virFree (ptrptr=0x8) at util/memory.c:310 #1 0x00002aaaaae167c8 in xenXMDomainDefineXML (conn=0x694e80, xml=0x6b2ce0 "P\fk") at xen/xm_internal.c:1199 #2 0x00002aaaaae070d7 in xenUnifiedDomainDefineXML (conn=0x8, xml=0x6ac040 "<domain type='xen'>\n <name>pv</name>\n <uuid>20291bc0-453a-4d6c-c6ac-4e5af63b932c</uuid>\n <memory>1048576</memory>\n <currentMemory>1048576</currentMemory>\n <vcpu>1</vcpu>\n <os>\n <type arch='x8"...) at xen/xen_driver.c:1524 #3 0x00002aaaaada7803 in virDomainDefineXML (conn=0x694e80, xml=0x6ac040 "<domain type='xen'>\n <name>pv</name>\n <uuid>20291bc0-453a-4d6c-c6ac-4e5af63b932c</uuid>\n <memory>1048576</memory>\n <currentMemory>1048576</currentMemory>\n <vcpu>1</vcpu>\n <os>\n <type arch='x8"...) at libvirt.c:7823 #4 0x0000000000426173 in cmdEdit (ctl=0x7fffffffb8e0, cmd=<value optimized out>) at virsh.c:14882 #5 0x000000000041c9ce in vshCommandRun (ctl=0x7fffffffb8e0, cmd=0x658c50) at virsh.c:17712 #6 0x000000000042c3b9 in main (argc=1, argv=<value optimized out>) at virsh.c:19317 Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xen/xm_internal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index a34e906..02a0e1d 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1196,7 +1196,8 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) error: VIR_FREE(filename); - VIR_FREE(entry->filename); + if (entry) + VIR_FREE(entry->filename); VIR_FREE(entry); virDomainDefFree(def); xenUnifiedUnlock(priv); -- 1.7.1

2 1

[libvirt] [libvirt-glib] Don't assign const char * to non-const
by Christophe Fergeau 06 Feb '12

06 Feb '12

This causes a gcc warning. --- libvirt-gobject/libvirt-gobject-storage-pool.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index db496f3..5a4b4bc 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -548,7 +548,7 @@ GVirStorageVol *gvir_storage_pool_create_volume } GVirStorageVol *volume; - char *name; + const char *name; volume = GVIR_STORAGE_VOL(g_object_new(GVIR_TYPE_STORAGE_VOL, "handle", handle, -- 1.7.7.6

2 1

[libvirt] [PATCH] RFC Libvirt + Openvswitch
by Ansis Atteka 06 Feb '12

06 Feb '12

This patch allows libvirt to add interfaces to already existing Open vSwitch bridges. The following syntax in domain XML file must be used: <interface type='bridge'> <mac address='52:54:00:d0:3f:f2'/> <source bridge='ovsbr'/> <virtualport type='openvswitch'> <parameters interfaceid='921a80cd-e6de-5a2e-db9c-ab27f15a6e1d'/> </virtualport> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> or if libvirt should auto-generate the interfaceid us following syntax: <interface type='bridge'> <mac address='52:54:00:d0:3f:f2'/> <source bridge='ovsbr'/> <virtualport type='openvswitch'> </virtualport> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> To create Open vSwitch bridge us following command: ovs-vsctl add-br ovsbr 1. This patch has been tested only on Ubuntu 11.10 with KVM 2. Auto-generated interfaceid is not persistent across libvirt reboots --- configure.ac | 5 ++ src/Makefile.am | 2 + src/conf/domain_conf.c | 46 ++++++++++++++ src/conf/domain_conf.h | 6 ++ src/conf/netdev_openvswitch_conf.c | 94 +++++++++++++++++++++++++++++ src/conf/netdev_openvswitch_conf.h | 39 ++++++++++++ src/libvirt_private.syms | 12 ++++ src/lxc/lxc_driver.c | 19 ++++-- src/network/bridge_driver.c | 3 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_hotplug.c | 7 ++- src/qemu/qemu_process.c | 3 + src/uml/uml_conf.c | 3 +- src/util/uuid.c | 19 ++++++ src/util/uuid.h | 1 + src/util/virnetdevopenvswitch.c | 114 ++++++++++++++++++++++++++++++++++++ src/util/virnetdevopenvswitch.h | 46 ++++++++++++++ src/util/virnetdevtap.c | 32 +++++++++- src/util/virnetdevtap.h | 8 ++- 19 files changed, 447 insertions(+), 15 deletions(-) create mode 100644 src/conf/netdev_openvswitch_conf.c create mode 100644 src/conf/netdev_openvswitch_conf.h create mode 100644 src/util/virnetdevopenvswitch.c create mode 100644 src/util/virnetdevopenvswitch.h diff --git a/configure.ac b/configure.ac index 9fb7bfc..dca178f 100644 --- a/configure.ac +++ b/configure.ac @@ -213,6 +213,8 @@ AC_PATH_PROG([UDEVSETTLE], [udevsettle], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_PATH_PROG([MODPROBE], [modprobe], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) +AC_PATH_PROG([OVSVSCTL], [ovs-vsctl], [ovs-vsctl], + [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"], [Location or name of the dnsmasq program]) @@ -220,6 +222,9 @@ AC_DEFINE_UNQUOTED([RADVD],["$RADVD"], [Location or name of the radvd program]) AC_DEFINE_UNQUOTED([TC],["$TC"], [Location or name of the tc profram (see iproute2)]) +AC_DEFINE_UNQUOTED([OVSVSCTL],["$OVSVSCTL"], + [Location or name of the ovs-vsctl program]) + if test -n "$UDEVADM"; then AC_DEFINE_UNQUOTED([UDEVADM],["$UDEVADM"], [Location or name of the udevadm program]) diff --git a/src/Makefile.am b/src/Makefile.am index a3dd847..79a2dde 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -95,6 +95,7 @@ UTIL_SOURCES = \ util/virmacaddr.h util/virmacaddr.c \ util/virnetdev.h util/virnetdev.c \ util/virnetdevbandwidth.h util/virnetdevbandwidth.c \ + util/virnetdevopenvswitch.h util/virnetdevopenvswitch.c \ util/virnetdevbridge.h util/virnetdevbridge.c \ util/virnetdevmacvlan.c util/virnetdevmacvlan.h \ util/virnetdevtap.h util/virnetdevtap.c \ @@ -136,6 +137,7 @@ LOCK_DRIVER_SANLOCK_SOURCES = \ NETDEV_CONF_SOURCES = \ conf/netdev_bandwidth_conf.h conf/netdev_bandwidth_conf.c \ + conf/netdev_openvswitch_conf.h conf/netdev_openvswitch_conf.c \ conf/netdev_vport_profile_conf.h conf/netdev_vport_profile_conf.c # XML configuration format handling sources diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index aa4b32d..abec371 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31,6 +31,7 @@ #include <sys/time.h> #include <strings.h> +#include "internal.h" #include "virterror_internal.h" #include "datatypes.h" #include "domain_conf.h" @@ -50,6 +51,7 @@ #include "count-one-bits.h" #include "secret_conf.h" #include "netdev_vport_profile_conf.h" +#include "netdev_openvswitch_conf.h" #include "netdev_bandwidth_conf.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -952,6 +954,7 @@ virDomainActualNetDefFree(virDomainActualNetDefPtr def) switch (def->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: VIR_FREE(def->data.bridge.brname); + VIR_FREE(def->data.bridge.ovsPort); break; case VIR_DOMAIN_NET_TYPE_DIRECT: VIR_FREE(def->data.direct.linkdev); @@ -995,6 +998,7 @@ void virDomainNetDefFree(virDomainNetDefPtr def) case VIR_DOMAIN_NET_TYPE_BRIDGE: VIR_FREE(def->data.bridge.brname); VIR_FREE(def->data.bridge.ipaddr); + VIR_FREE(def->data.bridge.ovsPort); break; case VIR_DOMAIN_NET_TYPE_INTERNAL: @@ -3737,7 +3741,15 @@ virDomainActualNetDefParseXML(xmlNodePtr node, } if (actual->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { + xmlNodePtr virtPortNode = virXPathNode("./virtualport", ctxt); actual->data.bridge.brname = virXPathString("string(./source[1]/@bridge)", ctxt); + if (virtPortNode && virXMLPropString(virtPortNode, "type") && + STREQ(virXMLPropString(virtPortNode, "type"), "openvswitch")) { + if (!(actual->data.bridge.ovsPort = + virNetDevOpenvswitchPortParse(virtPortNode))) { + goto error; + } + } } else if (actual->type == VIR_DOMAIN_NET_TYPE_DIRECT) { xmlNodePtr virtPortNode; @@ -3817,6 +3829,7 @@ virDomainNetDefParseXML(virCapsPtr caps, char *linkstate = NULL; virNWFilterHashTablePtr filterparams = NULL; virNetDevVPortProfilePtr virtPort = NULL; + virNetDevOpenvswitchPortPtr ovsPort = NULL; virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; int ret; @@ -3870,6 +3883,13 @@ virDomainNetDefParseXML(virCapsPtr caps, xmlStrEqual(cur->name, BAD_CAST "virtualport")) { if (!(virtPort = virNetDevVPortProfileParse(cur))) goto error; + } else if ((ovsPort == NULL) && + ((def->type == VIR_DOMAIN_NET_TYPE_BRIDGE) && + xmlStrEqual(cur->name, BAD_CAST "virtualport") && + virXMLPropString(cur, "type") && + STREQ(virXMLPropString(cur, "type"), "openvswitch"))) { + if (!(ovsPort = virNetDevOpenvswitchPortParse(cur))) + goto error; } else if ((network == NULL) && ((def->type == VIR_DOMAIN_NET_TYPE_SERVER) || (def->type == VIR_DOMAIN_NET_TYPE_CLIENT) || @@ -4005,6 +4025,8 @@ virDomainNetDefParseXML(virCapsPtr caps, def->data.bridge.ipaddr = address; address = NULL; } + def->data.bridge.ovsPort = ovsPort; + ovsPort = NULL; break; case VIR_DOMAIN_NET_TYPE_CLIENT: @@ -10427,6 +10449,12 @@ virDomainActualNetDefFormat(virBufferPtr buf, case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferEscapeString(buf, " <source bridge='%s'/>\n", def->data.bridge.brname); + if (def->data.bridge.ovsPort) { + virBufferAdjustIndent(buf, 6); + if (virNetDevOpenvswitchPortFormat(def->data.bridge.ovsPort, buf) < 0) + return -1; + virBufferAdjustIndent(buf, -6); + } break; case VIR_DOMAIN_NET_TYPE_DIRECT: @@ -10514,6 +10542,12 @@ virDomainNetDefFormat(virBufferPtr buf, if (def->data.bridge.ipaddr) virBufferAsprintf(buf, " <ip address='%s'/>\n", def->data.bridge.ipaddr); + if (def->data.bridge.ovsPort) { + virBufferAdjustIndent(buf, 6); + if (virNetDevOpenvswitchPortFormat(def->data.bridge.ovsPort, buf) < 0) + return -1; + virBufferAdjustIndent(buf, -6); + } break; case VIR_DOMAIN_NET_TYPE_SERVER: @@ -13851,6 +13885,18 @@ virDomainNetGetActualBandwidth(virDomainNetDefPtr iface) return iface->bandwidth; } +virNetDevOpenvswitchPortPtr +virDomainNetGetActualOpenvswitchPortPtr(virDomainNetDefPtr iface) +{ + if (iface->type != VIR_DOMAIN_NET_TYPE_BRIDGE) + return NULL; + if (iface->data.bridge.ovsPort) + return iface->data.bridge.ovsPort; + if (!iface->data.network.actual) + return NULL; + return iface->data.network.actual->data.bridge.ovsPort; +} + /* Return listens[ii] from the appropriate union for the graphics * type, or NULL if this is an unsuitable type, or the index is out of diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0a2795d..b7eb7d1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -41,6 +41,7 @@ # include "virnetdevmacvlan.h" # include "sysinfo.h" # include "virnetdevvportprofile.h" +# include "virnetdevopenvswitch.h" # include "virnetdevbandwidth.h" /* Different types of hypervisor */ @@ -594,6 +595,7 @@ struct _virDomainActualNetDef { union { struct { char *brname; + virNetDevOpenvswitchPortPtr ovsPort; } bridge; struct { char *linkdev; @@ -645,6 +647,7 @@ struct _virDomainNetDef { struct { char *brname; char *ipaddr; + virNetDevOpenvswitchPortPtr ovsPort; } bridge; struct { char *name; @@ -1877,6 +1880,9 @@ virDomainNetGetActualDirectVirtPortProfile(virDomainNetDefPtr iface); virNetDevBandwidthPtr virDomainNetGetActualBandwidth(virDomainNetDefPtr iface); +virNetDevOpenvswitchPortPtr +virDomainNetGetActualOpenvswitchPortPtr(virDomainNetDefPtr iface); + int virDomainControllerInsert(virDomainDefPtr def, virDomainControllerDefPtr controller); void virDomainControllerInsertPreAlloced(virDomainDefPtr def, diff --git a/src/conf/netdev_openvswitch_conf.c b/src/conf/netdev_openvswitch_conf.c new file mode 100644 index 0000000..ddae3aa --- /dev/null +++ b/src/conf/netdev_openvswitch_conf.c @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2012 Nicira, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Dan Wendlandt <dan(a)nicira.com> + * Kyle Mestery <kmestery(a)cisco.com> + * Ansis Atteka <aatteka(a)nicira.com> + */ + +#include <config.h> + +#include "netdev_openvswitch_conf.h" +#include "virterror_internal.h" +#include "memory.h" +#include "uuid.h" + +#define VIR_FROM_THIS VIR_FROM_NONE +#define virNetDevError(code, ...) \ + virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) + + +virNetDevOpenvswitchPortPtr +virNetDevOpenvswitchPortParse(xmlNodePtr node) +{ + char *InterfaceID = NULL; + virNetDevOpenvswitchPortPtr ovsPort = NULL; + xmlNodePtr cur = node->children; + + if (VIR_ALLOC(ovsPort) < 0) { + virReportOOMError(); + goto error; + } + + while (cur != NULL) { + if (xmlStrEqual(cur->name, BAD_CAST "parameters")) { + InterfaceID = virXMLPropString(cur, "interfaceid"); + break; + } + cur = cur->next; + } + + if (InterfaceID == NULL || (strlen(InterfaceID) == 0)) { + // interfaceID does not have to be a UUID, + // but a UUID is a reasonable default + if (virUUIDGenerateStr(ovsPort->InterfaceID)) { + virNetDevError(VIR_ERR_XML_ERROR, "%s", + _("cannot generate a random uuid for interfaceid")); + goto error; + } + } else { + if (virStrcpyStatic(ovsPort->InterfaceID, InterfaceID) == NULL) { + virNetDevError(VIR_ERR_XML_ERROR, "%s", + _("InterfaceID parameter too long")); + goto error; + } + } + +cleanup: + return ovsPort; + +error: + VIR_FREE(ovsPort); + goto cleanup; +} + + +int +virNetDevOpenvswitchPortFormat(virNetDevOpenvswitchPortPtr ovsPort, + virBufferPtr buf) +{ + if (ovsPort == NULL) + return 0; + + virBufferAsprintf(buf, "<virtualport type='openvswitch'>\n"); + virBufferAsprintf(buf, " <parameters interfaceid='%s'/>\n", + ovsPort->InterfaceID); + virBufferAddLit(buf, "</virtualport>\n"); + return 0; +} diff --git a/src/conf/netdev_openvswitch_conf.h b/src/conf/netdev_openvswitch_conf.h new file mode 100644 index 0000000..fd8e079 --- /dev/null +++ b/src/conf/netdev_openvswitch_conf.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2012 Nicira, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Dan Wendlandt <dan(a)nicira.com> + * Kyle Mestery <kmestery(a)cisco.com> + * Ansis Atteka <aatteka(a)nicira.com> + */ + +#ifndef __VIR_NETDEV_OPENVSWITCH_CONF_H__ +# define __VIR_NETDEV_OPENVSWITCH_CONF_H__ + +# include "internal.h" +# include "virnetdevopenvswitch.h" +# include "buf.h" +# include "xml.h" + +virNetDevOpenvswitchPortPtr +virNetDevOpenvswitchPortParse(xmlNodePtr node); + +int +virNetDevOpenvswitchPortFormat(virNetDevOpenvswitchPortPtr ovsPort, + virBufferPtr buf); + +#endif /* __VIR_NETDEV_OPENVSWITCH_CONF_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d6ad36c..0666d5c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -379,6 +379,7 @@ virDomainNetGetActualBridgeName; virDomainNetGetActualDirectDev; virDomainNetGetActualDirectMode; virDomainNetGetActualDirectVirtPortProfile; +virDomainNetGetActualOpenvswitchPortPtr; virDomainNetGetActualType; virDomainNetIndexByMac; virDomainNetInsert; @@ -738,6 +739,10 @@ virShrinkN; virNetDevBandwidthFormat; virNetDevBandwidthParse; +# netdev_openvswitch_conf.h +virNetDevOpenvswitchPortFormat; +virNetDevOpenvswitchPortParse; + # netdev_vportprofile_conf.h virNetDevVPortProfileFormat; @@ -1145,6 +1150,7 @@ virGetHostUUID; virSetHostUUIDStr; virUUIDFormat; virUUIDGenerate; +virUUIDGenerateStr; virUUIDParse; @@ -1237,10 +1243,16 @@ virNetDevMacVLanCreateWithVPortProfile; virNetDevMacVLanDeleteWithVPortProfile; +# virnetdevopenvswitch.h +virNetDevOpenvswitchAddPort; +virNetDevOpenvswitchDelPort; + + # virnetdevtap.h virNetDevTapCreate; virNetDevTapCreateInBridgePort; virNetDevTapDelete; +virNetDevTapDeleteInBridgePort; # virnetdevveth.h diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b712da4..1fab77a 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -56,6 +56,7 @@ #include "domain_nwfilter.h" #include "network/bridge_driver.h" #include "virnetdev.h" +#include "virnetdevtap.h" #include "virnodesuspend.h" #include "virtime.h" #include "virtypedparam.h" @@ -1132,10 +1133,12 @@ static void lxcVmCleanup(lxc_driver_t *driver, priv->monitorWatch = -1; for (i = 0 ; i < vm->def->nnets ; i++) { - ignore_value(virNetDevSetOnline(vm->def->nets[i]->ifname, false)); - ignore_value(virNetDevVethDelete(vm->def->nets[i]->ifname)); - - networkReleaseActualDevice(vm->def->nets[i]); + virDomainNetDefPtr iface = vm->def->nets[i]; + ignore_value(virNetDevSetOnline(iface->ifname, false)); + ignore_value(virNetDevVethDelete(iface->ifname)); + ignore_value(virNetDevTapDeleteInBridgePort(iface->ifname, + virDomainNetGetActualOpenvswitchPortPtr(iface))); + networkReleaseActualDevice(iface); } virDomainConfVMNWFilterTeardown(vm); @@ -1377,8 +1380,12 @@ static int lxcSetupInterfaces(virConnectPtr conn, cleanup: if (ret != 0) { - for (i = 0 ; i < def->nnets ; i++) - networkReleaseActualDevice(def->nets[i]); + for (i = 0 ; i < def->nnets ; i++) { + virDomainNetDefPtr iface = def->nets[i]; + ignore_value(virNetDevTapDeleteInBridgePort(iface->ifname, + virDomainNetGetActualOpenvswitchPortPtr(iface))); + networkReleaseActualDevice(iface); + } } return ret; } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 57ebb9f..1423d3f 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1765,7 +1765,8 @@ networkStartNetworkVirtual(struct network_driver *driver, goto err0; } if (virNetDevTapCreateInBridgePort(network->def->bridge, - &macTapIfName, network->def->mac, 0, false, NULL) < 0) { + &macTapIfName, network->def->mac, 0, + false, NULL, NULL) < 0) { VIR_FREE(macTapIfName); goto err0; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0e26df1..d6a81f1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -247,7 +247,8 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); tapmac[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ err = virNetDevTapCreateInBridgePort(brname, &net->ifname, tapmac, - vnet_hdr, true, &tapfd); + vnet_hdr, true, &tapfd, + virDomainNetGetActualOpenvswitchPortPtr(net)); virDomainAuditNetDevice(def, net, "/dev/net/tun", tapfd >= 0); if (err < 0) { if (template_ifname) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b4870be..85a004d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -40,6 +40,7 @@ #include "qemu_cgroup.h" #include "locking/domain_lock.h" #include "network/bridge_driver.h" +#include "virnetdevtap.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -837,7 +838,8 @@ cleanup: if (iface_connected) virDomainConfNWFilterTeardown(net); - + ignore_value(virNetDevTapDeleteInBridgePort(net->ifname, + virDomainNetGetActualOpenvswitchPortPtr(net))); networkReleaseActualDevice(net); } @@ -1937,7 +1939,8 @@ int qemuDomainDetachNetDevice(struct qemud_driver *driver, detach->ifname); } } - + ignore_value(virNetDevTapDeleteInBridgePort(detach->ifname, + virDomainNetGetActualOpenvswitchPortPtr(detach))); networkReleaseActualDevice(detach); if (vm->def->nnets > 1) { memmove(vm->def->nets + i, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2d92d66..14eeef8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -62,6 +62,7 @@ #include "network/bridge_driver.h" #include "uuid.h" #include "virtime.h" +#include "virnetdevtap.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -3731,6 +3732,8 @@ void qemuProcessStop(struct qemud_driver *driver, /* release the physical device (or any other resources used by * this interface in the network driver */ + ignore_value(virNetDevTapDeleteInBridgePort(net->ifname, + virDomainNetGetActualOpenvswitchPortPtr(net))); networkReleaseActualDevice(net); } diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 316d558..b8610ea 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -142,7 +142,8 @@ umlConnectTapDevice(virConnectPtr conn, memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); tapmac[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ if (virNetDevTapCreateInBridgePort(bridge, &net->ifname, tapmac, - 0, true, NULL) < 0) { + 0, true, NULL, + virDomainNetGetActualOpenvswitchPortPtr(net)) < 0) { if (template_ifname) VIR_FREE(net->ifname); goto error; diff --git a/src/util/uuid.c b/src/util/uuid.c index 23822ec..d8188b7 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -116,6 +116,25 @@ virUUIDGenerate(unsigned char *uuid) } /** + * virUUIDGenerateString: + * @uuid: string of VIR_UUID_STRING_BUFLEN characters to store the UUID + * + * + * Generates a randomized unique identifier + * Returns 0 in case of success and -1 in case of failure + */ +int +virUUIDGenerateStr(char *uuidstr) +{ + unsigned char uuid[VIR_UUID_BUFLEN]; + + if (virUUIDGenerate(uuid) < 0) + return -1; + virUUIDFormat(uuid, uuidstr); + return 0; +} + +/** * virUUIDParse: * @uuidstr: zero terminated string representation of the UUID * @uuid: array of VIR_UUID_BUFLEN bytes to store the raw UUID diff --git a/src/util/uuid.h b/src/util/uuid.h index 7dbfad5..1ae7efb 100644 --- a/src/util/uuid.h +++ b/src/util/uuid.h @@ -30,6 +30,7 @@ int virGetHostUUID(unsigned char *host_uuid) ATTRIBUTE_NONNULL(1); int virUUIDIsValid(unsigned char *uuid); int virUUIDGenerate(unsigned char *uuid); +int virUUIDGenerateStr(char *struuid); int virUUIDParse(const char *uuidstr, unsigned char *uuid) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c new file mode 100644 index 0000000..c5bef8d --- /dev/null +++ b/src/util/virnetdevopenvswitch.c @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2012 Nicira, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Dan Wendlandt <dan(a)nicira.com> + * Kyle Mestery <kmestery(a)cisco.com> + * Ansis Atteka <aatteka(a)nicira.com> + */ + +#include <config.h> + +#include "virnetdevopenvswitch.h" +#include "command.h" +#include "memory.h" +#include "virterror_internal.h" +#include "ignore-value.h" +#include "virmacaddr.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +/** + * virNetDevOpenvswitchAddPort: + * @brname: the bridge name + * @ifname: the network interface name + * @macaddr: the mac address of the virtual interface + * + * Add an interface to the OVS bridge + * + * Returns 0 in case of success or -1 in case of failure. + */ +int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, + const unsigned char *macaddr, + virNetDevOpenvswitchPortPtr ovsport) +{ + int ret = -1; + virCommandPtr cmd = NULL; + char macaddrstr[VIR_MAC_STRING_BUFLEN]; + char *attachedmac_ex_id = NULL; + char *ifaceid_ex_id = NULL; + + virMacAddrFormat(macaddr, macaddrstr); + + if (virAsprintf(&attachedmac_ex_id, "external-ids:attached-mac=\"%s\"", + macaddrstr) < 0) + goto cleanup; + if (virAsprintf(&ifaceid_ex_id, "external-ids:iface-id=\"%s\"", + ovsport->InterfaceID) < 0) + goto cleanup; + + cmd = virCommandNew(OVSVSCTL); + virCommandAddArgList(cmd, "--", "--may-exist", "add-port", + brname, ifname, + "--", "set", "Interface", ifname, attachedmac_ex_id, + "--", "set", "Interface", ifname, ifaceid_ex_id, + "--", "set", "Interface", ifname, + "external-ids:iface-status=active", + NULL); + + if (virCommandRun(cmd, NULL) < 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, + _("Unable to add port %s to OVS bridge %s"), + ifname, brname); + goto cleanup; + } + ret = 0; + + cleanup: + VIR_FREE(attachedmac_ex_id); + VIR_FREE(ifaceid_ex_id); + virCommandFree(cmd); + return ret; +} + +/** + * virNetDevOpenvswitchDelPort: + * @ifname: the network interface name + * + * Deletes an interface from a OVS bridge + * + * Returns 0 in case of success or -1 in case of failure. + */ +int virNetDevOpenvswitchDelPort(const char *ifname) +{ + int ret = -1; + virCommandPtr cmd = NULL; + + cmd = virCommandNew(OVSVSCTL); + virCommandAddArgList(cmd, "--", "--if-exists", "del-port", ifname, NULL); + + if (virCommandRun(cmd, NULL) < 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, + _("Unable to delete port %s from OVS"), ifname); + goto cleanup; + } + ret = 0; + + cleanup: + virCommandFree(cmd); + return ret; +} diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h new file mode 100644 index 0000000..210546b --- /dev/null +++ b/src/util/virnetdevopenvswitch.h @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2012 Nicira, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Dan Wendlandt <dan(a)nicira.com> + * Kyle Mestery <kmestery(a)cisco.com> + * Ansis Atteka <aatteka(a)nicira.com> + */ + +#ifndef __VIR_NETDEV_OPENVSWITCH_H__ +# define __VIR_NETDEV_OPENVSWITCH_H__ + +# include "internal.h" +# include "util.h" + +typedef struct _virNetDevOpenvswitchPort virNetDevOpenvswitchPort; +typedef virNetDevOpenvswitchPort *virNetDevOpenvswitchPortPtr; +struct _virNetDevOpenvswitchPort { + char InterfaceID[VIR_UUID_STRING_BUFLEN]; +}; + +int virNetDevOpenvswitchAddPort(const char *brname, + const char *ifname, + const unsigned char *macaddr, + virNetDevOpenvswitchPortPtr ovsport) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_RETURN_CHECK; + +int virNetDevOpenvswitchDelPort(const char *ifname) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + +#endif /* __VIR_NETDEV_OPENVSWITCH_H__ */ diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 2ed53c6..975bb85 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -25,6 +25,7 @@ #include "virnetdevtap.h" #include "virnetdev.h" #include "virnetdevbridge.h" +#include "virnetdevopenvswitch.h" #include "virterror_internal.h" #include "virfile.h" #include "virterror_internal.h" @@ -249,6 +250,7 @@ int virNetDevTapDelete(const char *ifname ATTRIBUTE_UNUSED) * @macaddr: desired MAC address (VIR_MAC_BUFLEN long) * @vnet_hdr: whether to try enabling IFF_VNET_HDR * @tapfd: file descriptor return value for the new tap device + * @ovsport: Open vSwitch specific configuration * * This function creates a new tap device on a bridge. @ifname can be either * a fixed name or a name template with '%d' for dynamic name allocation. @@ -265,7 +267,8 @@ int virNetDevTapCreateInBridgePort(const char *brname, const unsigned char *macaddr, int vnet_hdr, bool up, - int *tapfd) + int *tapfd, + virNetDevOpenvswitchPortPtr ovsport) { if (virNetDevTapCreate(ifname, vnet_hdr, tapfd) < 0) return -1; @@ -286,8 +289,13 @@ int virNetDevTapCreateInBridgePort(const char *brname, if (virNetDevSetMTUFromDevice(*ifname, brname) < 0) goto error; - if (virNetDevBridgeAddPort(brname, *ifname) < 0) - goto error; + if (ovsport) { + if (virNetDevOpenvswitchAddPort(brname, *ifname, macaddr, ovsport) < 0) + goto error; + } else { + if (virNetDevBridgeAddPort(brname, *ifname) < 0) + goto error; + } if (virNetDevSetOnline(*ifname, up) < 0) goto error; @@ -299,3 +307,21 @@ int virNetDevTapCreateInBridgePort(const char *brname, return errno; } + +/** + * virNetDevTapDeleteInBridgePort: + * @ifname: the interface name (or name template) + * @ovsport: Open vSwitch specific configuration + * + * This function detaches tap device from a bridge. + * + * Returns 0 in case of success or -1 on failure + */ +int virNetDevTapDeleteInBridgePort(char *ifname, + virNetDevOpenvswitchPortPtr ovsport) +{ + int ret = 0; + if (ovsport) + ret = virNetDevOpenvswitchDelPort(ifname); + return ret; +} diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index fb35ac5..5b16570 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -24,6 +24,7 @@ # define __VIR_NETDEV_TAP_H__ # include "internal.h" +# include "conf/domain_conf.h" int virNetDevTapCreate(char **ifname, int vnet_hdr, @@ -38,8 +39,13 @@ int virNetDevTapCreateInBridgePort(const char *brname, const unsigned char *macaddr, int vnet_hdr, bool up, - int *tapfd) + int *tapfd, + virNetDevOpenvswitchPortPtr ovsport) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; +int virNetDevTapDeleteInBridgePort(char *ifname, + virNetDevOpenvswitchPortPtr ovsport) +ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + #endif /* __VIR_NETDEV_TAP_H__ */ -- 1.7.5.4

2 1

[libvirt] [PATCH] qemu: Fix seamless spice migration
by Jiri Denemark 06 Feb '12

06 Feb '12

Calling qemuDomainMigrateGraphicsRelocate notifies spice clients to connect to destination qemu so that they can seamlessly switch streams once migration is done. Unfortunately, current qemu is not able to accept any connections while incoming migration connection is open. Thus, we need to delay opening the migration connection to the point spice client is already connected to the destination qemu. --- src/qemu/qemu_migration.c | 83 +++++++++++++++++++++++++++++--------------- 1 files changed, 55 insertions(+), 28 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8453a47..687e77d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1381,6 +1381,7 @@ cleanup: enum qemuMigrationDestinationType { MIGRATION_DEST_HOST, + MIGRATION_DEST_CONNECT_HOST, MIGRATION_DEST_UNIX, MIGRATION_DEST_FD, }; @@ -1519,6 +1520,44 @@ cleanup: } static int +qemuMigrationConnect(struct qemud_driver *driver, + virDomainObjPtr vm, + qemuMigrationSpecPtr spec) +{ + virNetSocketPtr sock; + const char *host; + char *port = NULL; + int ret = -1; + + host = spec->dest.host.name; + if (virAsprintf(&port, "%d", spec->dest.host.port) < 0) { + virReportOOMError(); + return -1; + } + + spec->destType = MIGRATION_DEST_FD; + spec->dest.fd.qemu = -1; + + if (virSecurityManagerSetSocketLabel(driver->securityManager, vm->def) < 0) + goto cleanup; + if (virNetSocketNewConnectTCP(host, port, &sock) == 0) { + spec->dest.fd.qemu = virNetSocketDupFD(sock, true); + virNetSocketFree(sock); + } + if (virSecurityManagerClearSocketLabel(driver->securityManager, vm->def) < 0 || + spec->dest.fd.qemu == -1) + goto cleanup; + + ret = 0; + +cleanup: + VIR_FREE(port); + if (ret < 0) + VIR_FORCE_CLOSE(spec->dest.fd.qemu); + return ret; +} + +static int qemuMigrationRun(struct qemud_driver *driver, virDomainObjPtr vm, const char *cookiein, @@ -1583,6 +1622,11 @@ qemuMigrationRun(struct qemud_driver *driver, if (flags & VIR_MIGRATE_NON_SHARED_INC) migrate_flags |= QEMU_MONITOR_MIGRATE_NON_SHARED_INC; + /* connect to the destination qemu if needed */ + if (spec->destType == MIGRATION_DEST_CONNECT_HOST && + qemuMigrationConnect(driver, vm, spec) < 0) + goto cleanup; + switch (spec->destType) { case MIGRATION_DEST_HOST: ret = qemuMonitorMigrateToHost(priv->mon, migrate_flags, @@ -1590,6 +1634,10 @@ qemuMigrationRun(struct qemud_driver *driver, spec->dest.host.port); break; + case MIGRATION_DEST_CONNECT_HOST: + /* handled above and transformed into MIGRATION_DEST_FD */ + break; + case MIGRATION_DEST_UNIX: if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_UNIX)) { ret = qemuMonitorMigrateToUnix(priv->mon, migrate_flags, @@ -1712,7 +1760,6 @@ static int doNativeMigrate(struct qemud_driver *driver, xmlURIPtr uribits = NULL; int ret = -1; qemuMigrationSpec spec; - char *tmp = NULL; VIR_DEBUG("driver=%p, vm=%p, uri=%s, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu", @@ -1720,6 +1767,7 @@ static int doNativeMigrate(struct qemud_driver *driver, cookieout, cookieoutlen, flags, resource); if (STRPREFIX(uri, "tcp:") && !STRPREFIX(uri, "tcp://")) { + char *tmp; /* HACK: source host generates bogus URIs, so fix them up */ if (virAsprintf(&tmp, "tcp://%s", uri + strlen("tcp:")) < 0) { virReportOOMError(); @@ -1736,41 +1784,20 @@ static int doNativeMigrate(struct qemud_driver *driver, return -1; } - spec.fwdType = MIGRATION_FWD_DIRECT; - - if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD)) { - virNetSocketPtr sock; - - spec.destType = MIGRATION_DEST_FD; - spec.dest.fd.qemu = -1; - - if (virAsprintf(&tmp, "%d", uribits->port) < 0) { - virReportOOMError(); - goto cleanup; - } - if (virSecurityManagerSetSocketLabel(driver->securityManager, vm->def) < 0) - goto cleanup; - if (virNetSocketNewConnectTCP(uribits->server, tmp, &sock) == 0) { - spec.dest.fd.qemu = virNetSocketDupFD(sock, true); - virNetSocketFree(sock); - } - if (virSecurityManagerClearSocketLabel(driver->securityManager, vm->def) < 0 || - spec.dest.fd.qemu == -1) - goto cleanup; - } else { + if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD)) + spec.destType = MIGRATION_DEST_CONNECT_HOST; + else spec.destType = MIGRATION_DEST_HOST; - spec.dest.host.name = uribits->server; - spec.dest.host.port = uribits->port; - } + spec.dest.host.name = uribits->server; + spec.dest.host.port = uribits->port; + spec.fwdType = MIGRATION_FWD_DIRECT; ret = qemuMigrationRun(driver, vm, cookiein, cookieinlen, cookieout, cookieoutlen, flags, resource, &spec, dconn); -cleanup: if (spec.destType == MIGRATION_DEST_FD) VIR_FORCE_CLOSE(spec.dest.fd.qemu); - VIR_FREE(tmp); xmlFreeURI(uribits); return ret; -- 1.7.8.4

2 2

[libvirt] [PATCH] docs: Enhance documentation of the old-style boot configuration
by Jiri Denemark 06 Feb '12

06 Feb '12

Also encourages people to use per-device boot elements for better control. --- docs/formatdomain.html.in | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 6bf64a6..ff09113 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -131,12 +131,24 @@ <dd>The <code>dev</code> attribute takes one of the values "fd", "hd", "cdrom" or "network" and is used to specify the next boot device to consider. The <code>boot</code> element can be repeated multiple - times to setup a priority list of boot devices to try in turn. The - <code>boot</code> element cannot be used if per-device boot elements - are used (see <a href="#elementsDisks">disks</a>, + times to setup a priority list of boot devices to try in turn. + Multiple devices of the same type are sorted according to their + targets while preserving the order of buses. After defining the + domain, its XML configuration returned by libvirt (through + virDomainGetXMLDesc) lists devices in the sorted order. Once sorted, + the first device is marked as bootable. Thus, e.g., a domain + configured to boot from "hd" with vdb, hda, vda, and hdc disks + assigned to it will boot from vda (the sorted list is vda, vdb, hda, + hdc). Similar domain with hdc, vda, vdb, and hda disks will boot from + hda (sorted disks are: hda, hdc, vda, vdb). It can be tricky to + configure in the desired way, which is why per-device boot elements + (see <a href="#elementsDisks">disks</a>, <a href="#elementsNICS">network interfaces</a>, and - <a href="#elementsUSB">USB and PCI devices</a> sections below). - <span class="since">Since 0.1.3, per-device boot since 0.8.8</span> + <a href="#elementsUSB">USB and PCI devices</a> sections below) were + introduced and they are the preferred way providing full control over + booting order. The <code>boot</code> element and per-device boot + elements are mutually exclusive. <span class="since">Since 0.1.3, + per-device boot since 0.8.8</span> </dd> <dt><code>bootmenu</code></dt> <dd> Whether or not to enable an interactive boot menu prompt on guest -- 1.7.8.4

2 2

[libvirt] [PATCH] tests: Fix build with -Werror
by Jiri Denemark 06 Feb '12

06 Feb '12

--- Pushed as build-breaker. Use of uninitialized "n" after the former "error" label was the issue (gcc didn't get it right though). I forgot to mention this in the commit message :-( tests/cputest.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index 15614a7..870f99f 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -126,17 +126,17 @@ cpuTestLoadMultiXML(const char *arch, goto cleanup; if (!(doc = virXMLParseFileCtxt(xml, &ctxt))) - goto error; + goto cleanup; n = virXPathNodeSet("/cpuTest/cpu", ctxt, &nodes); if (n <= 0 || (VIR_ALLOC_N(cpus, n) < 0)) - goto error; + goto cleanup; for (i = 0; i < n; i++) { ctxt->node = nodes[i]; cpus[i] = virCPUDefParseXML(nodes[i], ctxt, VIR_CPU_TYPE_HOST); if (!cpus[i]) - goto error; + goto cleanup_cpus; } *count = n; @@ -148,13 +148,10 @@ cleanup: xmlFreeDoc(doc); return cpus; -error: - if (cpus) { - for (i = 0; i < n; i++) - virCPUDefFree(cpus[i]); - VIR_FREE(cpus); - cpus = NULL; - } +cleanup_cpus: + for (i = 0; i < n; i++) + virCPUDefFree(cpus[i]); + VIR_FREE(cpus); goto cleanup; } -- 1.7.8.4

1 0

[libvirt] [PATCH] apparmor: Add missing comma
by Jiri Denemark 06 Feb '12

06 Feb '12

Typo introduced by c18a88ac --- Pushed as build-breaker. src/security/virt-aa-helper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 1971f40..3c9e541 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -917,7 +917,7 @@ get_files(vahControl * ctl) int ret = virDomainDiskDefForeachPath(ctl->def->disks[i], ctl->allowDiskFormatProbing, true, - -1, -1 /* current uid:gid */ + -1, -1, /* current uid:gid */ add_file_path, &buf); if (ret != 0) -- 1.7.8.4

1 0

[libvirt] [PATCH] virsh: Avoid invalid read of size errors
by ajia＠redhat.com 06 Feb '12

06 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. the codes are allocating 0 bytes memory to variable cpumap by vshCalloc function, and then the function VIR_USE_CPU will access it later, a invalid read error will be hit. * tools/virsh.c(cmdVcpuPin): fix invalid read error. * How to reproduce? % valgrind -v --read-var-info=yes virsh vcpupin <domain> 0 0 * Actual result: ==27271== ERROR SUMMARY: 5 errors from 2 contexts (suppressed: 8 from 6) ==27271== ==27271== 1 errors in context 1 of 2: ==27271== Invalid read of size 1 ==27271== at 0x39CF087E2E: __GI_memcpy (in /lib64/libc-2.12.so) ==27271== by 0x39CF114FDC: xdrmem_putbytes (in /lib64/libc-2.12.so) ==27271== by 0x39CF114707: xdr_opaque (in /lib64/libc-2.12.so) ==27271== by 0x4D56194: xdr_remote_domain_pin_vcpu_args (remote_protocol.c:1844) ==27271== by 0x4D6CCE1: virNetMessageEncodePayload (virnetmessage.c:341) ==27271== by 0x4D5A44B: virNetClientProgramCall (virnetclientprogram.c:327) ==27271== by 0x4D36EDB: callWithFD (remote_driver.c:4546) ==27271== by 0x4D36F7B: call (remote_driver.c:4567) ==27271== by 0x4D3B2C1: remoteDomainPinVcpu (remote_client_bodies.h:1566) ==27271== by 0x4D199D3: virDomainPinVcpu (libvirt.c:8585) ==27271== by 0x4241F4: cmdVcpuPin (virsh.c:5262) ==27271== by 0x4150A6: vshCommandRun (virsh.c:17712) ==27271== Address 0x5602b80 is 0 bytes after a block of size 0 alloc'd ==27271== at 0x4A04A28: calloc (vg_replace_malloc.c:467) ==27271== by 0x4C89BDF: virAllocN (memory.c:129) ==27271== by 0x423868: _vshCalloc.clone.2 (virsh.c:454) ==27271== by 0x423EF9: cmdVcpuPin (virsh.c:5190) ==27271== by 0x4150A6: vshCommandRun (virsh.c:17712) ==27271== by 0x426583: main (virsh.c:19289) ==27271== ==27271== ==27271== 4 errors in context 2 of 2: ==27271== Invalid read of size 1 ==27271== at 0x424133: cmdVcpuPin (virsh.c:5245) ==27271== by 0x4150A6: vshCommandRun (virsh.c:17712) ==27271== by 0x426583: main (virsh.c:19289) ==27271== Address 0x5602b80 is 0 bytes after a block of size 0 alloc'd ==27271== at 0x4A04A28: calloc (vg_replace_malloc.c:467) ==27271== by 0x4C89BDF: virAllocN (memory.c:129) ==27271== by 0x423868: _vshCalloc.clone.2 (virsh.c:454) ==27271== by 0x423EF9: cmdVcpuPin (virsh.c:5190) ==27271== by 0x4150A6: vshCommandRun (virsh.c:17712) ==27271== by 0x426583: main (virsh.c:19289) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 72ca93a..1613d2e 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -5187,7 +5187,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) /* Pin mode: pinning specified vcpu to specified physical cpus*/ - cpumap = vshCalloc(ctl, 0, cpumaplen); + cpumap = vshCalloc(ctl, cpumaplen, sizeof(cpumap)); /* Parse cpulist */ cur = cpulist; if (*cur == 0) { -- 1.7.1

3 2

[libvirt] [PATCH 1/4] add a qemu-specific event register API, to passthough the new events come from qemu
by shaohef＠linux.vnet.ibm.com 05 Feb '12

05 Feb '12

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Basically, this feature can go along with qemu monitor passthrough. That way, if we use new commands in the monitor that generate new events, we want some way to receive those new events too. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- include/libvirt/libvirt-qemu.h | 27 ++++ include/libvirt/libvirt.h.in | 2 +- src/conf/domain_event.c | 293 ++++++++++++++++++++++++++++++++++++++-- src/conf/domain_event.h | 50 ++++++- src/driver.h | 14 ++ src/libvirt-qemu.c | 189 ++++++++++++++++++++++++++ src/libvirt_private.syms | 6 + src/libvirt_qemu.syms | 5 + 8 files changed, 571 insertions(+), 15 deletions(-) diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index 7f12e4f..3aa944a 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -32,6 +32,33 @@ virDomainPtr virDomainQemuAttach(virConnectPtr domain, unsigned int pid, unsigned int flags); +/** + * virConnectDomainQemuEventCallback: + * @conn: connection object + * @dom: domain on which the event occurred + * @eventName : the name of the unknow or un-implementation event + * @eventArgs: the content of the unknow or un-implementation event + * + * The callback signature to use when registering for an event of type + * VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN with virConnectDomainQemuEventRegister() + */ +typedef void (*virConnectDomainQemuEventCallback)(virConnectPtr conn, + virDomainPtr dom, + const char *eventName, /* The JSON event name */ + const char *eventArgs, /* The JSON string of args */ + void *opaque); + +int +virConnectDomainQemuEventRegister(virConnectPtr conn, + virDomainPtr dom, /* option to filter */ + const char *eventName, /* JSON event name */ + virConnectDomainQemuEventCallback cb, + void *opaque, + virFreeCallback freecb); +int +virConnectDomainQemuEventDeregister(virConnectPtr conn, + int callbackID); + # ifdef __cplusplus } # endif diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 2480add..9fcb400 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3207,7 +3207,6 @@ typedef void (*virConnectDomainEventBlockJobCallback)(virConnectPtr conn, int type, int status, void *opaque); - /** * virConnectDomainEventDiskChangeReason: * @@ -3263,6 +3262,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_CONTROL_ERROR = 7, /* virConnectDomainEventGenericCallback */ VIR_DOMAIN_EVENT_ID_BLOCK_JOB = 8, /* virConnectDomainEventBlockJobCallback */ VIR_DOMAIN_EVENT_ID_DISK_CHANGE = 9, /* virConnectDomainEventDiskChangeCallback */ + VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN = 10, /* virConnectDomainEventDefaultCallback */ /* * NB: this enum value will increase over time as new events are diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 614ab97..0388a66 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -45,7 +45,9 @@ typedef virDomainMeta *virDomainMetaPtr; struct _virDomainEventCallback { int callbackID; + int qemuCallbackID; int eventID; + char *eventName; virConnectPtr conn; virDomainMetaPtr dom; virConnectDomainEventGenericCallback cb; @@ -94,6 +96,10 @@ struct _virDomainEvent { char *devAlias; int reason; } diskChange; + struct { + char *eventName; + char *eventArgs; + }qemuUnknownEvent; } data; }; @@ -112,6 +118,7 @@ virDomainEventCallbackListFree(virDomainEventCallbackListPtr list) for (i=0; i<list->count; i++) { virFreeCallback freecb = list->callbacks[i]->freecb; + VIR_FREE(list->callbacks[i]->eventName); if (freecb) (*freecb)(list->callbacks[i]->opaque); VIR_FREE(list->callbacks[i]); @@ -187,8 +194,10 @@ virDomainEventCallbackListRemoveID(virConnectPtr conn, if (freecb) (*freecb)(cbList->callbacks[i]->opaque); virUnrefConnect(cbList->callbacks[i]->conn); + if (cbList->callbacks[i]->eventID == VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN) { + VIR_FREE(cbList->callbacks[i]->eventName); + } VIR_FREE(cbList->callbacks[i]); - if (i < (cbList->count - 1)) memmove(cbList->callbacks + i, cbList->callbacks + i + 1, @@ -231,6 +240,9 @@ virDomainEventCallbackListRemoveConn(virConnectPtr conn, if (freecb) (*freecb)(cbList->callbacks[i]->opaque); virUnrefConnect(cbList->callbacks[i]->conn); + if (cbList->callbacks[i]->eventID == VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN) { + VIR_FREE(cbList->callbacks[i]->eventName); + } VIR_FREE(cbList->callbacks[i]); if (i < (cbList->count - 1)) @@ -299,6 +311,9 @@ int virDomainEventCallbackListPurgeMarked(virDomainEventCallbackListPtr cbList) if (freecb) (*freecb)(cbList->callbacks[i]->opaque); virUnrefConnect(cbList->callbacks[i]->conn); + if (cbList->callbacks[i]->eventID == VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN) { + VIR_FREE(cbList->callbacks[i]->eventName); + } VIR_FREE(cbList->callbacks[i]); if (i < (cbList->count - 1)) @@ -404,7 +419,98 @@ virDomainEventCallbackListAddID(virConnectPtr conn, cbList->callbacks[cbList->count] = event; cbList->count++; + event->callbackID = cbList->nextID++; + + return event->callbackID; + +no_memory: + virReportOOMError(); + + if (event) { + if (event->dom) + VIR_FREE(event->dom->name); + VIR_FREE(event->dom); + } + VIR_FREE(event); + return -1; +} + + + +/** + * virDomainEventCallbackListAddName: + * @conn: pointer to the connection + * @cbList: the list + * @eventName: the event eventName + * @callback: the callback to add + * @eventID: the specific eventID + * @opaque: opaque data tio pass to callback + * + * Internal function to add a callback from a virDomainEventCallbackListPtr + */ +int +virDomainEventCallbackListAddName(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + virDomainPtr dom, + const char* eventName, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) +{ + virDomainEventCallbackPtr event; + int i; + + /* Check incoming */ + if ( !cbList ) { + return -1; + } + + /* check if we already have this callback on our list */ + for (i = 0 ; i < cbList->count ; i++) { + if (cbList->callbacks[i]->cb == VIR_DOMAIN_EVENT_CALLBACK(callback) && + STREQ(cbList->callbacks[i]->eventName, eventName) && + cbList->callbacks[i]->eventID == eventID && + cbList->callbacks[i]->conn == conn) { + eventReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("event callback already tracked")); + return -1; + } + } + if (eventID > VIR_DOMAIN_EVENT_ID_LAST || eventID < VIR_DOMAIN_EVENT_ID_LIFECYCLE) { + eventReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("not suport this kind of eventID: %d"), eventID); + } + /* Allocate new event */ + if (VIR_ALLOC(event) < 0) + goto no_memory; + event->conn = conn; + event->cb = callback; + if (eventName == NULL) + goto no_memory; + event->eventName = strdup(eventName); + if ( event->eventName == NULL) + goto no_memory; + event->opaque = opaque; + event->freecb = freecb; + event->eventID = eventID; + if (dom) { + if (VIR_ALLOC(event->dom) < 0) + goto no_memory; + if (!(event->dom->name = strdup(dom->name))) + goto no_memory; + memcpy(event->dom->uuid, dom->uuid, VIR_UUID_BUFLEN); + event->dom->id = dom->id; + } + /* Make space on list */ + if (VIR_REALLOC_N(cbList->callbacks, cbList->count + 1) < 0) + goto no_memory; + + event->conn->refs++; + + cbList->callbacks[cbList->count] = event; + cbList->count++; event->callbackID = cbList->nextID++; return event->callbackID; @@ -416,11 +522,40 @@ no_memory: if (event->dom) VIR_FREE(event->dom->name); VIR_FREE(event->dom); + VIR_FREE(event->eventName); } VIR_FREE(event); return -1; } +/** + * virDomainEventCallbackListAddQemuCallbackID: + * @conn: pointer to the connection + * @cbList: the list + * @callbackID: the libvirt callback ID + * @qemuCallbackID: the libvirtd callback ID to add + * + * Internal function to add a Daemon libvirtd callbackID + */ +int +virDomainEventCallbackListAddQemuCallbackID(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID, + int qemuCallbackID) +{ + int i; + for (i = 0 ; i < cbList->count ; i++) { + if (cbList->callbacks[i]->callbackID == callbackID && + cbList->callbacks[i]->conn == conn) { + cbList->callbacks[i]->qemuCallbackID = qemuCallbackID; + return 0; + } + } + + eventReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("could not find event callback for deletion")); + return -1; +} int virDomainEventCallbackListCountID(virConnectPtr conn, virDomainEventCallbackListPtr cbList, @@ -442,6 +577,27 @@ int virDomainEventCallbackListCountID(virConnectPtr conn, } +int +virDomainEventCallbackListCountName(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + const char *eventName) +{ + int i; + int count = 0; + + for (i = 0 ; i < cbList->count ; i++) { + if (cbList->callbacks[i]->deleted) + continue; + + if (STREQ(cbList->callbacks[i]->eventName,eventName) && + cbList->callbacks[i]->conn == conn) + count++; + } + + return count; +} + + int virDomainEventCallbackListEventID(virConnectPtr conn, virDomainEventCallbackListPtr cbList, int callbackID) @@ -461,6 +617,44 @@ int virDomainEventCallbackListEventID(virConnectPtr conn, } +const char* +virDomainEventCallbackListEventName(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID) +{ + int i; + + for (i = 0 ; i < cbList->count ; i++) { + if (cbList->callbacks[i]->deleted) + continue; + + if (cbList->callbacks[i]->callbackID == callbackID && + cbList->callbacks[i]->conn == conn) + return cbList->callbacks[i]->eventName; + } + + return NULL; +} + +int +virDomainEventCallbackListEventQemuCallbackID(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID) +{ + int i; + + for (i = 0 ; i < cbList->count ; i++) { + if (cbList->callbacks[i]->deleted) + continue; + + if (cbList->callbacks[i]->callbackID == callbackID && + cbList->callbacks[i]->conn == conn) + return cbList->callbacks[i]->qemuCallbackID; + } + + return -1; +} + int virDomainEventCallbackListCount(virDomainEventCallbackListPtr cbList) { int i; @@ -521,6 +715,11 @@ void virDomainEventFree(virDomainEventPtr event) VIR_FREE(event->data.diskChange.newSrcPath); VIR_FREE(event->data.diskChange.devAlias); break; + + case VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN: + VIR_FREE(event->data.qemuUnknownEvent.eventName); + VIR_FREE(event->data.qemuUnknownEvent.eventArgs); + break; } VIR_FREE(event->dom.name); @@ -956,6 +1155,51 @@ virDomainEventPtr virDomainEventBlockJobNewFromDom(virDomainPtr dom, path, type, status); } +static virDomainEventPtr +virDomainEventUnknownNew(int id, const char *name, unsigned char *uuid, + const char *eventName, const char *eventArgs) +{ + virDomainEventPtr ev = + virDomainEventNewInternal(VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN, + id, name, uuid); + if (ev) { + if (!(ev->data.qemuUnknownEvent.eventName = strdup(eventName))) { + virReportOOMError(); + VIR_FREE(ev->dom.name); + VIR_FREE(ev); + return NULL; + } + if (eventArgs) { + if (!(ev->data.qemuUnknownEvent.eventArgs = strdup(eventArgs))) { + virReportOOMError(); + VIR_FREE(ev->data.qemuUnknownEvent.eventName); + VIR_FREE(ev->dom.name); + VIR_FREE(ev); + return NULL; + } + } + } + + return ev; +} + +virDomainEventPtr virDomainEventUnknownNewFromObj(virDomainObjPtr obj, + const char *eventName, + const char *eventArgs) +{ + + return virDomainEventUnknownNew(obj->def->id, obj->def->name, + obj->def->uuid, eventName, eventArgs); +} + +virDomainEventPtr virDomainEventUnknownNewFromDom(virDomainPtr dom, + const char *eventName, + const char *eventArgs) +{ + return virDomainEventUnknownNew(dom->id, dom->name, dom->uuid, + eventName, eventArgs); +} + virDomainEventPtr virDomainEventControlErrorNewFromDom(virDomainPtr dom) { virDomainEventPtr ev = @@ -1095,11 +1339,12 @@ virDomainEventQueuePush(virDomainEventQueuePtr evtQueue, } -void virDomainEventDispatchDefaultFunc(virConnectPtr conn, - virDomainEventPtr event, - virConnectDomainEventGenericCallback cb, - void *cbopaque, - void *opaque ATTRIBUTE_UNUSED) +void +virDomainEventDispatchDefaultFunc(virConnectPtr conn, + virDomainEventPtr event, + virConnectDomainEventGenericCallback cb, + void *cbopaque, + void *opaque ATTRIBUTE_UNUSED) { virDomainPtr dom = virGetDomain(conn, event->dom.name, event->dom.uuid); if (!dom) @@ -1180,6 +1425,13 @@ void virDomainEventDispatchDefaultFunc(virConnectPtr conn, cbopaque); break; + case VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN: + ((virConnectDomainQemuEventCallback)cb)(conn, dom, + event->data.qemuUnknownEvent.eventName, + event->data.qemuUnknownEvent.eventArgs, + cbopaque); + break; + default: VIR_WARN("Unexpected event ID %d", event->eventID); break; @@ -1189,8 +1441,9 @@ void virDomainEventDispatchDefaultFunc(virConnectPtr conn, } -static int virDomainEventDispatchMatchCallback(virDomainEventPtr event, - virDomainEventCallbackPtr cb) +static int +virDomainEventDispatchMatchCallback(virDomainEventPtr event, + virDomainEventCallbackPtr cb) { if (!cb) return 0; @@ -1198,7 +1451,12 @@ static int virDomainEventDispatchMatchCallback(virDomainEventPtr event, return 0; if (cb->eventID != event->eventID) return 0; - + if (event->eventID == VIR_QEMU_DOMAIN_EVENT_ID_UNKNOWN) { + if (event->data.qemuUnknownEvent.eventName == NULL || + cb->eventName == NULL || + STRNEQ(cb->eventName, event->data.qemuUnknownEvent.eventName)) + return 0; + } if (cb->dom) { /* Deliberately ignoring 'id' for matching, since that * will cause problems when a domain switches between @@ -1341,3 +1599,20 @@ virDomainEventStateDeregisterAny(virConnectPtr conn, virDomainEventStateUnlock(state); return ret; } +int +virDomainQemuEventStateDeregister(virConnectPtr conn, + virDomainEventStatePtr state, + int callbackID) +{ + int ret; + + virDomainEventStateLock(state); + if (state->isDispatching) + ret = virDomainEventCallbackListMarkDeleteID(conn, + state->callbacks, callbackID); + else + ret = virDomainEventCallbackListRemoveID(conn, + state->callbacks, callbackID); + virDomainEventStateUnlock(state); + return ret; +} diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 3ba418e..f2fe847 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -83,14 +83,23 @@ int virDomainEventCallbackListAddID(virConnectPtr conn, virFreeCallback freecb) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(5); +int virDomainEventCallbackListAddName(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + virDomainPtr dom, + const char* eventName, + int eventID, + virConnectDomainEventGenericCallback callback, + void *opaque, + virFreeCallback freecb) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(6); int virDomainEventCallbackListRemove(virConnectPtr conn, virDomainEventCallbackListPtr cbList, virConnectDomainEventCallback callback) ATTRIBUTE_NONNULL(1); -int virDomainEventCallbackListRemoveID(virConnectPtr conn, - virDomainEventCallbackListPtr cbList, - int callbackID) +int virDomainQemuEventCallbackListRemoveID(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID) ATTRIBUTE_NONNULL(1); int virDomainEventCallbackListRemoveConn(virConnectPtr conn, virDomainEventCallbackListPtr cbList) @@ -106,9 +115,14 @@ int virDomainEventCallbackListMarkDeleteID(virConnectPtr conn, int callbackID) ATTRIBUTE_NONNULL(1); - int virDomainEventCallbackListPurgeMarked(virDomainEventCallbackListPtr cbList); +int virDomainEventCallbackListAddQemuCallbackID(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID, + int qemuCallbackID) + ATTRIBUTE_NONNULL(1); + int virDomainEventCallbackListCount(virDomainEventCallbackListPtr cbList); int virDomainEventCallbackListCountID(virConnectPtr conn, virDomainEventCallbackListPtr cbList, @@ -119,6 +133,21 @@ int virDomainEventCallbackListEventID(virConnectPtr conn, int callbackID) ATTRIBUTE_NONNULL(1); +int virDomainEventCallbackListCountName(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + const char *eventName) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + +int virDomainEventCallbackListEventQemuCallbackID(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID) + ATTRIBUTE_NONNULL(1); + +const char* virDomainEventCallbackListEventName(virConnectPtr conn, + virDomainEventCallbackListPtr cbList, + int callbackID) + ATTRIBUTE_NONNULL(1); + virDomainEventQueuePtr virDomainEventQueueNew(void); virDomainEventPtr virDomainEventNew(int id, const char *name, const unsigned char *uuid, int type, int detail); @@ -190,6 +219,13 @@ virDomainEventPtr virDomainEventDiskChangeNewFromDom(virDomainPtr dom, const char *devAlias, int reason); +virDomainEventPtr virDomainEventUnknownNewFromObj(virDomainObjPtr obj, + const char *eventName, + const char *eventArgs); +virDomainEventPtr virDomainEventUnknownNewFromDom(virDomainPtr dom, + const char *eventName, + const char *eventArgs); + int virDomainEventQueuePush(virDomainEventQueuePtr evtQueue, virDomainEventPtr event); @@ -246,5 +282,9 @@ virDomainEventStateDeregisterAny(virConnectPtr conn, virDomainEventStatePtr state, int callbackID) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); - +int +virDomainQemuEventStateDeregister(virConnectPtr conn, + virDomainEventStatePtr state, + int callbackID) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); #endif diff --git a/src/driver.h b/src/driver.h index 941ff51..51164a9 100644 --- a/src/driver.h +++ b/src/driver.h @@ -635,6 +635,18 @@ typedef virDomainPtr unsigned int flags); typedef int + (*virDrvDomainQemuEventRegister)(virConnectPtr conn, + virDomainPtr dom, /* option to filter */ + const char *eventName, /* JSON event name */ + virConnectDomainEventGenericCallback cb, + void *opaque, + virFreeCallback freecb); + +typedef int + (*virDrvDomainQemuEventDeregister)(virConnectPtr conn, + int callbackID); + +typedef int (*virDrvDomainOpenConsole)(virDomainPtr dom, const char *dev_name, virStreamPtr st, @@ -915,6 +927,8 @@ struct _virDriver { virDrvDomainSnapshotDelete domainSnapshotDelete; virDrvDomainQemuMonitorCommand qemuDomainMonitorCommand; virDrvDomainQemuAttach qemuDomainAttach; + virDrvDomainQemuEventRegister qemuDomainQemuEventRegister; + virDrvDomainQemuEventDeregister qemuDomainQemuEventDeregister; virDrvDomainOpenConsole domainOpenConsole; virDrvDomainOpenGraphics domainOpenGraphics; virDrvDomainInjectNMI domainInjectNMI; diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c index 248cc33..7722b7b 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -36,6 +36,77 @@ virReportErrorHelper(VIR_FROM_DOM, error, NULL, __FUNCTION__, \ __LINE__, info) +/* Helper macros to implement VIR_DOMAIN_DEBUG using just C99. This + * assumes you pass fewer than 15 arguments to VIR_DOMAIN_DEBUG, but + * can easily be expanded if needed. + * + * Note that gcc provides extensions of "define a(b...) b" or + * "define a(b,...) b,##__VA_ARGS__" as a means of eliding a comma + * when no var-args are present, but we don't want to require gcc. + */ +#define VIR_ARG15(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, ...) _15 +#define VIR_HAS_COMMA(...) VIR_ARG15(__VA_ARGS__, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0) + +/* Form the name VIR_DOMAIN_DEBUG_[01], then call that macro, + * according to how many arguments are present. Two-phase due to + * macro expansion rules. */ +#define VIR_DOMAIN_DEBUG_EXPAND(a, b, ...) \ + VIR_DOMAIN_DEBUG_PASTE(a, b, __VA_ARGS__) +#define VIR_DOMAIN_DEBUG_PASTE(a, b, ...) \ + a##b(__VA_ARGS__) + +/* Internal use only, when VIR_DOMAIN_DEBUG has one argument. */ +#define VIR_DOMAIN_DEBUG_0(dom) \ + VIR_DOMAIN_DEBUG_2(dom, "%s", "") + +/* Internal use only, when VIR_DOMAIN_DEBUG has three or more arguments. */ +#define VIR_DOMAIN_DEBUG_1(dom, fmt, ...) \ + VIR_DOMAIN_DEBUG_2(dom, ", " fmt, __VA_ARGS__) + +/* Internal use only, with final format. */ +#define VIR_DOMAIN_DEBUG_2(dom, fmt, ...) \ + do { \ + char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ + const char *_domname = NULL; \ + \ + if (!VIR_IS_DOMAIN(dom)) { \ + memset(_uuidstr, 0, sizeof(_uuidstr)); \ + } else { \ + virUUIDFormat((dom)->uuid, _uuidstr); \ + _domname = (dom)->name; \ + } \ + \ + VIR_DEBUG("dom=%p, (VM: name=%s, uuid=%s)" fmt, \ + dom, NULLSTR(_domname), _uuidstr, __VA_ARGS__); \ + } while (0) + +/** + * VIR_DOMAIN_DEBUG: + * @dom: domain + * @fmt: optional format for additional information + * @...: optional arguments corresponding to @fmt. + */ +#define VIR_DOMAIN_DEBUG(...) \ + VIR_DOMAIN_DEBUG_EXPAND(VIR_DOMAIN_DEBUG_, \ + VIR_HAS_COMMA(__VA_ARGS__), \ + __VA_ARGS__) + +/** + * VIR_UUID_DEBUG: + * @conn: connection + * @uuid: possibly null UUID array + */ +#define VIR_UUID_DEBUG(conn, uuid) \ + do { \ + if (uuid) { \ + char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ + virUUIDFormat(uuid, _uuidstr); \ + VIR_DEBUG("conn=%p, uuid=%s", conn, _uuidstr); \ + } else { \ + VIR_DEBUG("conn=%p, uuid=(null)", conn); \ + } \ + } while (0) + /** * virDomainQemuMonitorCommand: * @domain: a domain object @@ -178,3 +249,121 @@ error: virDispatchError(conn); return NULL; } + +/** + * virConnectDomainQemuEventRegister: + * @conn: pointer to the connection + * @dom: pointer to the domain + * @eventName: the event Name to receive + * @cb: callback to the function handling domain events + * @opaque: opaque data to pass on to the callback + * @freecb: optional function to deallocate opaque when not used anymore + * + * Adds a callback to receive notifications of arbitrary qemu domain events + * occurring on a domain. + * + * If dom is NULL, then events will be monitored for any domain. If dom + * is non-NULL, then only the specific domain will be monitored + * + * Most types of event have a callback providing a custom set of parameters + * for the event. When registering an event, it is thus neccessary to use + * the VIR_DOMAIN_EVENT_CALLBACK() macro to cast the supplied function pointer + * to match the signature of this method. + * + * The virDomainPtr object handle passed into the callback upon delivery + * of an event is only valid for the duration of execution of the callback. + * If the callback wishes to keep the domain object after the callback returns, + * it shall take a reference to it, by calling virDomainRef. + * The reference can be released once the object is no longer required + * by calling virDomainFree. + * + * The return value from this method is a positive integer identifier + * for the callback. To unregister a callback, this callback ID should + * be passed to the virConnectDomainQemuEventDeregister method + * + * Returns a callback identifier on success, -1 on failure + */ +int +virConnectDomainQemuEventRegister(virConnectPtr conn, + virDomainPtr dom, /* option to filter */ + const char *eventName, /* JSON event name */ + virConnectDomainQemuEventCallback cb, + void *opaque, + virFreeCallback freecb) +{ + VIR_DOMAIN_DEBUG(dom, "conn=%p, eventName=%s, cb=%p, opaque=%p, freecb=%p", + conn, eventName, cb, opaque, freecb); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + if (dom != NULL && + !(VIR_IS_CONNECTED_DOMAIN(dom) && dom->conn == conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(conn); + return -1; + } + if (eventName == NULL || cb == NULL) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + + if ((conn->driver) && (conn->driver->qemuDomainQemuEventRegister)) { + int ret; + ret = conn->driver->qemuDomainQemuEventRegister(conn, dom, eventName, cb, opaque, freecb); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + virDispatchError(conn); + return -1; +} + +/** + * virConnectDomainQemuEventDeregister: + * @conn: pointer to the connection + * @callbackID: the callback identifier + * + * Removes an event callback. The callbackID parameter should be the + * vaule obtained from a previous virConnectDomainQemuEventDeregister method. + * + * Returns 0 on success, -1 on failure + */ +int +virConnectDomainQemuEventDeregister(virConnectPtr conn, + int callbackID) +{ + + VIR_DEBUG("conn=%p, callbackID=%d", conn, callbackID); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + if (callbackID < 0) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + if ((conn->driver) && (conn->driver->qemuDomainQemuEventDeregister)) { + int ret; + ret = conn->driver->qemuDomainQemuEventDeregister(conn, callbackID); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + virDispatchError(conn); + return -1; +} diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 48ffdf2..75e544a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -471,11 +471,16 @@ virDomainWatchdogModelTypeToString; # domain_event.h virDomainEventBlockJobNewFromObj; virDomainEventBlockJobNewFromDom; +virDomainEventUnknownNewFromObj; +virDomainEventunknownNewFromDom; virDomainEventCallbackListAdd; virDomainEventCallbackListAddID; +virDomainEventCallbackListAddName; virDomainEventCallbackListCount; virDomainEventCallbackListCountID; +virDomainEventCallbackListCountName; virDomainEventCallbackListEventID; +virDomainEventCallbackListEventName; virDomainEventCallbackListFree; virDomainEventCallbackListMarkDelete; virDomainEventCallbackListMarkDeleteID; @@ -512,6 +517,7 @@ virDomainEventRebootNewFromDom; virDomainEventRebootNewFromObj; virDomainEventStateDeregister; virDomainEventStateDeregisterAny; +virDomainQemuEventStateDeregister; virDomainEventStateFlush; virDomainEventStateFree; virDomainEventStateNew; diff --git a/src/libvirt_qemu.syms b/src/libvirt_qemu.syms index 8447730..a17e387 100644 --- a/src/libvirt_qemu.syms +++ b/src/libvirt_qemu.syms @@ -19,3 +19,8 @@ LIBVIRT_QEMU_0.9.4 { global: virDomainQemuAttach; } LIBVIRT_QEMU_0.8.3; +LIBVIRT_QEMU_0.9.9 { + global: + virConnectDomainQemuEventRegister; + virConnectDomainQemuEventDeregister; +} LIBVIRT_QEMU_0.9.4; -- 1.7.5.4

4 16

[libvirt] Fwd: oVirt Beijing - March 21st
by Itamar Heim 04 Feb '12

04 Feb '12

-------- Original Message -------- Subject: oVirt Beijing - March 21st Date: Fri, 03 Feb 2012 15:52:41 -0500 From: Carl Trieloff <cctrieloff(a)redhat.com> Spread the word/ come join us! http://www.ovirt.org/news-and-events/workshop/ Carl

1 0

[libvirt] [PATCH 1/2 v3] Python: Refactoring virTypedParameter conversion for NUMA tuning APIs
by Guannan Ren 04 Feb '12

04 Feb '12

*virDomainSetNumaParameters *virDomainGetNumaParameters --- python/Makefile.am | 4 +- python/libvirt-override-api.xml | 13 ++ python/libvirt-override.c | 314 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 330 insertions(+), 1 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am index 3068eee..4302fa5 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -8,6 +8,8 @@ SUBDIRS= . tests INCLUDES = \ $(PYTHON_INCLUDES) \ -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/gnulib/lib \ -I$(top_builddir)/include \ -I$(top_builddir)/$(subdir) \ $(GETTEXT_CPPFLAGS) @@ -42,7 +44,7 @@ all-local: libvirt.py libvirt_qemu.py pyexec_LTLIBRARIES = libvirtmod.la libvirtmod_qemu.la -libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c +libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c ../src/util/virtypedparam.c nodist_libvirtmod_la_SOURCES = libvirt.c libvirt.h # Python <= 2.4 header files contain a redundant decl, hence we # need extra flags here diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 704fee9..748aa17 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -248,6 +248,19 @@ <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> + <function name='virDomainSetNumaParameters' file='python'> + <info>Change the NUMA tunables</info> + <return type='int' info='-1 in case of error, 0 in case of success.'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='params' type='virTypedParameterPtr' info='pointer to numa tunable objects'/> + <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> + </function> + <function name='virDomainGetNumaParameters' file='python'> + <info>Get the NUMA parameters</info> + <return type='int' info='returns a dictionary of params in case of success, -1 in case of error'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> + </function> <function name='virConnectListStoragePools' file='python'> <info>list the storage pools, stores the pointers to the names in @names</info> <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index d2aad0f..5f9d83e 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -21,6 +21,7 @@ #include "libvirt/virterror.h" #include "typewrappers.h" #include "libvirt.h" +#include "util/virtypedparam.h" #ifndef __CYGWIN__ extern void initlibvirtmod(void); @@ -61,6 +62,208 @@ static char *py_str(PyObject *obj) return PyString_AsString(str); } +/* Two helper functions to help the conversions between C to Python + * for the virTypedParameter used in the following APIs. */ +static PyObject * +getPyVirTypedParameter(virTypedParameterPtr params, int nparams) +{ + PyObject *info; + PyObject *key, *val; + PyObject *ret = NULL; + int i; + + if (!params) + return ret; + + /* convert to a Python tuple of long objects */ + if ((info = PyDict_New()) == NULL) { + return ret; + } + + for (i = 0 ; i < nparams ; i++) { + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + val = PyInt_FromLong((long)params[i].value.i); + break; + + case VIR_TYPED_PARAM_UINT: + val = PyInt_FromLong((unsigned long)params[i].value.ui); + break; + + case VIR_TYPED_PARAM_LLONG: + val = PyLong_FromLongLong((long long)params[i].value.l); + break; + + case VIR_TYPED_PARAM_ULLONG: + val = PyLong_FromUnsignedLongLong((unsigned long long)params[i].value.ul); + break; + + case VIR_TYPED_PARAM_DOUBLE: + val = PyFloat_FromDouble((double)params[i].value.d); + break; + + case VIR_TYPED_PARAM_BOOLEAN: + val = PyBool_FromLong((long)params[i].value.b); + break; + + case VIR_TYPED_PARAM_STRING: + val = libvirt_constcharPtrWrap(params[i].value.s); + break; + + default: + Py_DECREF(info); + return ret; + } + + key = libvirt_constcharPtrWrap(params[i].field); + if (!key || !val) + goto fail; + + if (PyDict_SetItem(info, key, val) < 0) + goto fail; + + Py_DECREF(key); + Py_DECREF(val); + } + return info; +fail: + Py_XDECREF(info); + Py_XDECREF(key); + Py_XDECREF(val); + return ret; +} + +static PyObject * +setPyVirTypedParameter(PyObject *info, virTypedParameterPtr params, int nparams) +{ + PyObject *key, *val; + PyObject *ret = NULL; + int i; + + if (!info || !params) + return ret; + + /* convert to a Python tuple of long objects */ + for (i = 0; i < nparams; i++) { + key = libvirt_constcharPtrWrap(params[i].field); + val = PyDict_GetItem(info, key); + Py_DECREF(key); + + if (val == NULL) + continue; + + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + { + long long_val; + if (PyInt_Check(val)) { + long_val = PyInt_AsLong(val); + if ((long_val == -1) && PyErr_Occurred()) + return ret; + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be int"); + return ret; + } + params[i].value.i = (int)long_val; + } + break; + case VIR_TYPED_PARAM_UINT: + { + long long_val; + if (PyInt_Check(val)) { + long_val = PyInt_AsLong(val); + if ((long_val == -1) && PyErr_Occurred()) + return ret; + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be int"); + return ret; + } + params[i].value.ui = (unsigned int)long_val; + } + break; + case VIR_TYPED_PARAM_LLONG: + { + long long llong_val; + if (PyLong_Check(val)) { + llong_val = PyLong_AsLongLong(val); + if ((llong_val == -1) && PyErr_Occurred()) + return ret; + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be long"); + return ret; + } + params[i].value.l = llong_val; + } + break; + case VIR_TYPED_PARAM_ULLONG: + { + unsigned long long ullong_val; + if (PyLong_Check(val)) { + ullong_val = PyLong_AsUnsignedLongLong(val); + if ((ullong_val == -1) && PyErr_Occurred()) + return ret; + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be long"); + return ret; + + } + params[i].value.ul = ullong_val; + } + break; + case VIR_TYPED_PARAM_DOUBLE: + { + double double_val; + if (PyFloat_Check(val)) { + double_val = PyFloat_AsDouble(val); + if ((double_val == -1) && PyErr_Occurred()) + return ret; + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be float"); + return ret; + } + params[i].value.d = double_val; + } + break; + case VIR_TYPED_PARAM_BOOLEAN: + { + /* Hack - Python's definition of Py_True breaks strict + * aliasing rules, so can't directly compare + */ + if (PyBool_Check(val)) { + PyObject *hacktrue = PyBool_FromLong(1); + params[i].value.b = hacktrue == val ? 1: 0; + Py_DECREF(hacktrue); + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be bool"); + return ret; + } + } + break; + case VIR_TYPED_PARAM_STRING: + { + if (PyString_Check(val)) { + free(params[i].value.s); + params[i].value.s = PyString_AsString(val); + } else { + PyErr_SetString(PyExc_TypeError, + "Attribute value type must be string"); + return ret; + } + } + break; + default: + return ret; + } + } + return VIR_PY_NONE; +} + /************************************************************************ * * * Statistics * @@ -1000,6 +1203,115 @@ libvirt_virDomainGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, } static PyObject * +libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *info; + PyObject *ret = NULL; + int i_retval; + int nparams = 0; + unsigned int flags; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, + (char *)"OOi:virDomainSetNumaParameters", + &pyobj_domain, &info, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_INT_FAIL; + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto fail; + } + + if (!setPyVirTypedParameter(info, params, nparams)) + goto fail; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainSetNumaParameters(domain, params, nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto fail; + } + + /* The string generated by PyString_AsString + * must not be deallocated */ + free(params); + return VIR_PY_INT_SUCCESS; +fail: + /*same as above*/ + free(params); + return ret; +} + +static PyObject * +libvirt_virDomainGetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *info; + PyObject *ret = NULL; + int i_retval; + int nparams = 0; + unsigned int flags; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetNumaParameters", + &pyobj_domain, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_INT_FAIL; + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetNumaParameters(domain, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto fail; + } + + info = getPyVirTypedParameter(params, nparams); + if (!info) + goto fail; + + virTypedParameterArrayClear(params, nparams); + free(params); + return info; + +fail: + virTypedParameterArrayClear(params, nparams); + free(params); + return ret; +} + +static PyObject * libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; @@ -5162,6 +5474,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetBlkioParameters", libvirt_virDomainGetBlkioParameters, METH_VARARGS, NULL}, {(char *) "virDomainSetMemoryParameters", libvirt_virDomainSetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetMemoryParameters", libvirt_virDomainGetMemoryParameters, METH_VARARGS, NULL}, + {(char *) "virDomainSetNumaParameters", libvirt_virDomainSetNumaParameters, METH_VARARGS, NULL}, + {(char *) "virDomainGetNumaParameters", libvirt_virDomainGetNumaParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetVcpus", libvirt_virDomainGetVcpus, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpu", libvirt_virDomainPinVcpu, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpuFlags", libvirt_virDomainPinVcpuFlags, METH_VARARGS, NULL}, -- 1.7.7.5

3 9

[libvirt] [PATCH] maint: consolidate several .gitignore files
by Eric Blake 03 Feb '12

03 Feb '12

Unlike .cvsignore under CVS, git allows for ignoring nested names. We weren't very consistent where new tests were being ignored (some in .gitignore, some in tests/.gitignore), and I found it easier to just consolidate everything. * .gitignore: Subsume entries from subdirectories. * daemon/.gitignore: Delete. * docs/.gitignore: Likewise. * docs/devhelp/.gitignore: Likewise. * docs/html/.gitignore: Likewise. * examples/dominfo/.gitignore: Likewise. * examples/domsuspend/.gitignore: Likewise. * examples/hellolibvirt/.gitignore: Likewise. * examples/openauth/.gitignore: Likewise. * examples/domain-events/events-c/.gitignore: Likewise. * include/libvirt/.gitignore: Likewise. * src/.gitignore: Likewise. * src/esx/.gitignore: Likewise. * tests/.gitignore: Likewise. * tools/.gitignore: Likewise. --- .gitignore | 75 +++++++++++++++++++++++++++- daemon/.gitignore | 15 ------ docs/.gitignore | 8 --- docs/devhelp/.gitignore | 4 -- docs/html/.gitignore | 1 - examples/domain-events/events-c/.gitignore | 6 -- examples/dominfo/.gitignore | 5 -- examples/domsuspend/.gitignore | 5 -- examples/hellolibvirt/.gitignore | 5 -- examples/openauth/.gitignore | 5 -- include/libvirt/.gitignore | 3 - python/.gitignore | 13 ----- src/.gitignore | 22 -------- src/esx/.gitignore | 1 - tests/.gitignore | 44 ---------------- tools/.gitignore | 14 ----- 16 files changed, 73 insertions(+), 153 deletions(-) delete mode 100644 daemon/.gitignore delete mode 100644 docs/.gitignore delete mode 100644 docs/devhelp/.gitignore delete mode 100644 docs/html/.gitignore delete mode 100644 examples/domain-events/events-c/.gitignore delete mode 100644 examples/dominfo/.gitignore delete mode 100644 examples/domsuspend/.gitignore delete mode 100644 examples/hellolibvirt/.gitignore delete mode 100644 examples/openauth/.gitignore delete mode 100644 include/libvirt/.gitignore delete mode 100644 python/.gitignore delete mode 100644 src/.gitignore delete mode 100644 src/esx/.gitignore delete mode 100644 tests/.gitignore delete mode 100644 tools/.gitignore diff --git a/.gitignore b/.gitignore index d1a4226..3e85e4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,28 @@ *#*# *.#*# *.a +*.cov *.exe *.gcda *.gcno *.gcov +*.html +*.i *.la *.lo +*.loT *.o *.orig +*.pyc *.rej +*.s *~ +.deps .git .git-module-status +.libs .lvimrc +.memdump .sc-start-sc_* /ABOUT-NLS /COPYING @@ -37,11 +46,30 @@ /configure /configure.lineno /daemon/*_dispatch.h +/daemon/libvirt_qemud +/daemon/libvirtd +/daemon/libvirtd.init +/daemon/libvirtd.service +/daemon/libvirtd*.logrotate +/daemon/libvirtd.8 +/daemon/libvirtd.8.in +/daemon/libvirtd.pod +/daemon/probes.h +/docs/devhelp/libvirt.devhelp /docs/hvsupport.html.in +/docs/libvirt-api.xml /docs/libvirt-qemu-*.xml +/docs/libvirt-refs.xml +/docs/todo.html.in +/examples/domain-events/events-c/event-test +/examples/dominfo/info1 +/examples/domsuspend/suspend +/examples/hellolibvirt/hellolibvirt +/examples/openauth/openauth /gnulib/lib/* /gnulib/m4/* /gnulib/tests/* +/include/libvirt/libvirt.h /libtool /libvirt-*.tar.gz /libvirt-[0-9]* @@ -55,31 +83,74 @@ /mkinstalldirs /po/* /proxy/ +/python/generated.stamp /python/generator.py.stamp +/python/libvirt-export.c /python/libvirt-qemu-export.c /python/libvirt-qemu.[ch] +/python/libvirt.[ch] +/python/libvirt.py /python/libvirt_qemu.py /sc_* +/src/esx/*.generated.* /src/hyperv/*.generated.* -/src/libvirt_iohelper +/src/libvirt*.def +/src/libvirt.syms +/src/libvirt_*.stp +/src/libvirt_*helper +/src/libvirt_lxc /src/locking/qemu-sanlock.conf +/src/probes.h /src/remote/*_client_bodies.h /src/remote/*_protocol.[ch] /src/rpc/virkeepaliveprotocol.[ch] /src/rpc/virnetprotocol.[ch] /src/util/virkeymaps.h +/src/virt-aa-helper /tests/*.log +/tests/*.pid +/tests/*xml2*test +/tests/commandhelper +/tests/conftest /tests/cputest /tests/domainsnapshotxml2xmltest +/tests/esxutilstest +/tests/eventtest /tests/hashtest /tests/jsontest /tests/networkxml2argvtest +/tests/nodeinfotest /tests/nwfilterxml2xmltest +/tests/object-locking +/tests/object-locking-files.txt +/tests/object-locking.cm[ix] /tests/openvzutilstest +/tests/qemuargv2xmltest +/tests/qemuhelptest /tests/qemuxmlnstest +/tests/qparamtest +/tests/reconnect +/tests/secaatest +/tests/seclabeltest +/tests/sexpr2xmltest /tests/shunloadtest +/tests/sockettest +/tests/ssh +/tests/statstest +/tests/utiltest +/tests/virbuftest /tests/virhashtest -/tools/virt-host-validate +/tests/virnet*test +/tests/virshtest +/tests/vmx2xmltest +/tests/xencapstest +/tests/xmconfigtest +/tools/*.[18] +/tools/libvirt-guests.init +/tools/virsh +/tools/virsh-*-edit.c +/tools/virt-*-validate +/tools/virt-sanlock-cleanup /update.log Makefile Makefile.in diff --git a/daemon/.gitignore b/daemon/.gitignore deleted file mode 100644 index 2873143..0000000 --- a/daemon/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.la -*.lo -.deps -.libs -Makefile -Makefile.in -libvirt_qemud -libvirtd -libvirtd.init -libvirtd.service -libvirtd*.logrotate -libvirtd.8 -libvirtd.8.in -libvirtd.pod -probes.h diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index dd78dd0..0000000 --- a/docs/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -Makefile -Makefile.in -.memdump -apibuild.pyc -*.html -libvirt-api.xml -libvirt-refs.xml -todo.html.in diff --git a/docs/devhelp/.gitignore b/docs/devhelp/.gitignore deleted file mode 100644 index 9c75b93..0000000 --- a/docs/devhelp/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -libvirt.devhelp -*.html diff --git a/docs/html/.gitignore b/docs/html/.gitignore deleted file mode 100644 index 2d19fc7..0000000 --- a/docs/html/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.html diff --git a/examples/domain-events/events-c/.gitignore b/examples/domain-events/events-c/.gitignore deleted file mode 100644 index ed9ac4d..0000000 --- a/examples/domain-events/events-c/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -*.exe -.deps -.libs -event-test diff --git a/examples/dominfo/.gitignore b/examples/dominfo/.gitignore deleted file mode 100644 index 4626c13..0000000 --- a/examples/dominfo/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile.in -Makefile -.deps -.libs -info1 diff --git a/examples/domsuspend/.gitignore b/examples/domsuspend/.gitignore deleted file mode 100644 index 02eeb79..0000000 --- a/examples/domsuspend/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile.in -Makefile -.deps -.libs -suspend diff --git a/examples/hellolibvirt/.gitignore b/examples/hellolibvirt/.gitignore deleted file mode 100644 index b8d036d..0000000 --- a/examples/hellolibvirt/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -hellolibvirt -.deps -.libs diff --git a/examples/openauth/.gitignore b/examples/openauth/.gitignore deleted file mode 100644 index 1431557..0000000 --- a/examples/openauth/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -openauth -.deps -.libs diff --git a/include/libvirt/.gitignore b/include/libvirt/.gitignore deleted file mode 100644 index 7bd42da..0000000 --- a/include/libvirt/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -libvirt.h diff --git a/python/.gitignore b/python/.gitignore deleted file mode 100644 index c191f74..0000000 --- a/python/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -Makefile -Makefile.in -.deps -.libs -*.lo -*.la -*.loT -libvirt.py -libvirt-export.c -libvirt.c -libvirt.h -*.pyc -generated.stamp diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 64e6aec..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,22 +0,0 @@ -Makefile -Makefile.in -.deps -.libs -*.lo -*.loT -*.la -*.exe -*.cov -libvirt_parthelper -libvirt_lxc -libvirt.def -libvirt.syms -libvirt_qemu.def -*.i -*.s -remote_protocol-structs-t -virt-aa-helper -libvirt_functions.stp -libvirt_probes.stp -probes.o -probes.h diff --git a/src/esx/.gitignore b/src/esx/.gitignore deleted file mode 100644 index 29e1d48..0000000 --- a/src/esx/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.generated.* diff --git a/tests/.gitignore b/tests/.gitignore deleted file mode 100644 index 027b421..0000000 --- a/tests/.gitignore +++ /dev/null @@ -1,44 +0,0 @@ -*.exe -.deps -.libs -ssh -commandhelper -commandhelper.log -commandhelper.pid -commandtest -conftest -esxutilstest -eventtest -interfacexml2xmltest -networkxml2xmltest -nodedevxml2xmltest -nodeinfotest -object-locking -object-locking-files.txt -object-locking.cmi -object-locking.cmx -qemuargv2xmltest -qemuhelptest -qemuxml2argvtest -qemuxml2xmltest -qparamtest -reconnect -secaatest -seclabeltest -sexpr2xmltest -sockettest -statstest -storagepoolxml2xmltest -storagevolxml2xmltest -utiltest -virbuftest -virnetmessagetest -virnetsockettest -virnettlscontexttest -virshtest -virtimetest -vmx2xmltest -xencapstest -xmconfigtest -xml2sexprtest -xml2vmxtest diff --git a/tools/.gitignore b/tools/.gitignore deleted file mode 100644 index 0f7a25e..0000000 --- a/tools/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -libvirt-guests.init -virt-xml-validate -virt-pki-validate -virt-sanlock-cleanup -*.1 -*.8 -Makefile -Makefile.in -virsh-net-edit.c -virsh-pool-edit.c -virsh -*.exe -.libs -.deps -- 1.7.7.6

2 2

[libvirt] [PATCHv2 0/2] qemu: new GRACEFUL flag for virDomainDestroy
by Laine Stump 03 Feb '12

03 Feb '12

This is the 2nd attempt at solving the problem of virDomainDestroy uncermoniously sending SIGKILL to the qemu process before it's had a chance to flush its disk buffers. In v1, I altered the default behavior of virDomainDestroy(), but that was rejected as changing established API behavior. In v2, the default behavior is maintained, and a new flag VIR_DOMAIN_DESTROY_GRACEFUL is added fo the virDomainDestroyFlags API. If that flag is included in the call, virDomainDestroyFlags will only send SIGTERM to the qemu process, and if that is unsuccessful, it will return an error rather than sending SIGKILL. I've also included a 2nd patch which lengthens the timeout prior to sending SIGKILL. Although there has been some sentiment against doing this, my opinion is that it's the prudent thing to do because: 1) The original timeout of 1.6 seconds was arbitrarily selected, and obviously isn't always adequate. 2) In the cases where the current timeout *is* adequate, there will be exactly 0 change in behavior anyway. The only time behavior will change (and that will just be in the form of a longer delay before the API call returns) will be in those cases where we would otherwise have caused guest disk corruption. I know which of those two options I would choose if it was my guest. 3) Just adding a new flag to the libvirt API does not do anything to help those who are stuck (if only temporarily) with an existing version of an application that doesn't support the new API flag. Since libvirt is the cause of the problem, we should try to mitigate the problem as much as possible without requiring updates of other packages.

4 14

[libvirt] [PATCHv4 0/2] qemu: eliminate "Ignoring open failure" (virFileOpenAs)
by Laine Stump 03 Feb '12

03 Feb '12

I believe this version addresses all the issues Eric raised in his review of V3, *except* those that we agreed should be left for a later patch. Patch 2/2 is unchanged all the way since v1. Patch 1/2 has the following changes from V3: * The "last ditch attempt to open the file in the parent process after failing with fork+setuid is done only if VIR_FILE_OPEN_NOFORK is false (meaning that it wasn't already tried). fchmod/fchown is then performed if necessary. * fchmod is only attempted after checking the file's current permissions and seeing that they don't match what is desired. * fchown and fchmod stuff is moved into a helper function that's called from 3 places. * fixed typos, added command about uid & gid no longer being "-1" Items *NOT* addressed: * eliminate log messages in child process * figure out how to have qemuOpenFile call virFileOpenAs just once * switch from use of waitpid to virPidWait() (and use of virPidAbort() to cause the child to terminate when an error is encountered while waiting for an fd from the child. * figure out when it is appropriate to unlink the file on failure. * move virFileOpenAs (and several other functions) to virfile.c

2 6

[libvirt] [PATCH v2 0/1] netlink events
by D. Herrendoerfer 03 Feb '12

03 Feb '12

From: "D. Herrendoerfer" <d.herrendoerfer(a)herrendoerfer.name> This is the second version of the netlink event code. it has most of the proposed changes by Eric and Daniel included. DirkH D. Herrendoerfer (1): Add netlink message event service daemon/libvirtd.c | 9 + src/Makefile.am | 1 + src/libvirt_private.syms | 8 + src/util/virnetlink.c | 447 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetlink.h | 64 +++++++ 5 files changed, 529 insertions(+), 0 deletions(-) create mode 100644 src/util/virnetlink.c create mode 100644 src/util/virnetlink.h -- 1.7.7.5

2 5

[libvirt] [RFC Incomplete Patch] Libvirt + Openvswitch
by Dan Wendlandt 03 Feb '12

03 Feb '12

Hello all, I know of many people who want to spin up VMs using libvirt + kvm/qemu and attach those VMs to an openvswitch bridge (see: http://www.openvswitch.org) However, the only way I know of to get this working is a kludge that uses to tap devices along with <interface type="ethernet"> while running ovs-vsctl outside of libvirt. Even worse, doing this on RHEL/Fedora seems to require privilege tweaks (e.g., running qemu as root, not dropping capabilities), which may not be acceptable for production deployments (see: http://fedoraproject.org/wiki/How_to_debug_Virtualization_problems#Errors_u…) So I would like to start taking steps toward better libvirt/openvswitch integration. My initial step has the fairly limit goal of enabling kvm/qemu VM NICs to attach to an openvswitch bridge in much the same way VM NIC can already attached to the linux bridge. For example, specifying: <interface type="openvswitch"> <source bridge="br0"/> <mac address="ca:fe:de;ad:be:ef"/> </interface> I also wanted to add a new child element of <interface> that can be used to specify some OVS specific configuration. To start, I just want to expose a single 'interfaceid' value (this parameter is specific to openvswitch). Extending the previous example: <interface type="openvswitch"> <source bridge="br0"/> <mac address="ca:fe:de;ad:be:ef"/> <openvswitchport interfaceid="interface-xyz"/> </interface> For this first step (see attached patch), I am only targeting the model where the OVS bridge has been created externally ahead of time. I am not tackling any of the "network" logic that actually creates/destroys bridges, as it is not needed for my target use case. A couple notes about the attached patch: - I haven't actually run this code. I was just poking around the libvirt code to learn about it and figured that a diff was the most concrete way to propose what I was thinking of doing. I would be curious for pointers about big chunks of work that I may have missed (for example, I haven't added any tests yet). - the code was modeled on the network interface "bandwidth" code, that calls out to 'tc' to configure bandwidth rates. Ideally we would be able to make direct C calls to OVS (and we plan to make that possible in the future), but calling an external utility right now is the only viable path. - no attention was paid to style guidelines. Will do that before any real submission. - I wasn't very clear on the notion of an "actual" net def, as opposed to a normal net def. What's the best place to look for documentation on this? Anyway, I'm primarily looking for feedback about whether I'm barking up the right tree before I spend time debugging or polishing the patch, so I would appreciate thoughts, advice, etc. Thanks, Dan -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~ Dan Wendlandt Nicira Networks: www.nicira.com twitter: danwendlandt ~~~~~~~~~~~~~~~~~~~~~~~~~~~

7 22

[libvirt] [libvirt-glib] Add gvir_storage_vol_resize()
by Zeeshan Ali (Khattak) 03 Feb '12

03 Feb '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Add wrapper for virStorageVolResize(). --- libvirt-gobject/libvirt-gobject-storage-vol.c | 27 +++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-vol.h | 20 ++++++++++++++++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 48 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 491e2e6..78ce76e 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -299,3 +299,30 @@ gboolean gvir_storage_vol_delete(GVirStorageVol *vol, return TRUE; } + +/** + * gvir_storage_vol_resize: + * @vol: the storage volume to resize + * @capacity: the new capacity of the volume + * @flags: (type GVirStorageVolResizeFlags): the flags + * @err: Return location for errors, or NULL + * + * Changes the capacity of the storage volume @vol to @capacity. + * + * Returns: #TRUE success, #FALSE otherwise + */ +gboolean gvir_storage_vol_resize(GVirStorageVol *vol, + guint64 capacity, + guint flags, + GError **err) +{ + if (virStorageVolResize(vol->priv->handle, capacity, flags) < 0) { + gvir_set_error_literal(err, + GVIR_STORAGE_VOL_ERROR, + 0, + "Unable to resize volume storage"); + return FALSE; + } + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.h b/libvirt-gobject/libvirt-gobject-storage-vol.h index 25f683a..b425f0a 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.h +++ b/libvirt-gobject/libvirt-gobject-storage-vol.h @@ -23,6 +23,7 @@ #if !defined(__LIBVIRT_GOBJECT_H__) && !defined(LIBVIRT_GOBJECT_BUILD) #error "Only <libvirt-gobject/libvirt-gobject.h> can be included directly." #endif +#include <libvirt/libvirt.h> #ifndef __LIBVIRT_GOBJECT_STORAGE_VOL_H__ #define __LIBVIRT_GOBJECT_STORAGE_VOL_H__ @@ -65,6 +66,21 @@ typedef enum { GVIR_STORAGE_VOL_STATE_DIR = 2, /* Directory-passthrough based volume */ } GVirStorageVolType; +/** + * GVirStorageVolResizeFlags: + * @GVIR_STORAGE_VOL_RESIZE_NONE: No flags + * @GVIR_STORAGE_VOL_RESIZE_ALLOCATE: force allocation of new size + * @GVIR_STORAGE_VOL_RESIZE_DELTA: size is relative to current + * @GVIR_STORAGE_VOL_RESIZE_SHRINK: allow decrease in capacity. This combined + * with #GVIR_STORAGE_VOL_RESIZE_DELTA, implies a negative delta. + */ +typedef enum { + GVIR_STORAGE_VOL_RESIZE_NONE = 0, + GVIR_STORAGE_VOL_RESIZE_ALLOCATE = VIR_STORAGE_VOL_RESIZE_ALLOCATE, + GVIR_STORAGE_VOL_RESIZE_DELTA = VIR_STORAGE_VOL_RESIZE_DELTA, + GVIR_STORAGE_VOL_RESIZE_SHRINK = VIR_STORAGE_VOL_RESIZE_SHRINK, +} GVirStorageVolResizeFlags; + typedef struct _GVirStorageVolInfo GVirStorageVolInfo; struct _GVirStorageVolInfo { @@ -89,6 +105,10 @@ GVirConfigStorageVol *gvir_storage_vol_get_config(GVirStorageVol *vol, GError **err); GVirStorageVolInfo *gvir_storage_vol_get_info(GVirStorageVol *vol, GError **err); +gboolean gvir_storage_vol_resize(GVirStorageVol *vol, + guint64 capacity, + guint flags, + GError **err); G_END_DECLS diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index a4f03f7..468bf65 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -126,6 +126,7 @@ LIBVIRT_GOBJECT_0.0.4 { gvir_storage_vol_get_config; gvir_storage_vol_get_info; gvir_storage_vol_delete; + gvir_storage_vol_resize; gvir_connection_handle_get_type; -- 1.7.7.6

3 2

[libvirt] [PATCH] virterror.c: Fix several spelling mistakes
by Philipp Hahn 03 Feb '12

03 Feb '12

compat{a->i}bility erron{->e}ous nec{c->}essary. Either "the" or "a". Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- ChangeLog-old | 36 ++++++++++++++++++------------------ docs/drvlxc.html.in | 2 +- docs/formatdomain.html.in | 4 ++-- docs/locking.html.in | 2 +- docs/migration.html.in | 2 +- docs/news.html.in | 6 +++--- src/conf/domain_conf.c | 6 +++--- src/libvirt.c | 2 +- src/lxc/lxc_container.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/rpc/virnetserverprogram.c | 2 +- src/util/virterror.c | 8 ++++---- src/xenxs/xen_sxpr.c | 2 +- 13 files changed, 38 insertions(+), 38 deletions(-) diff --git a/ChangeLog-old b/ChangeLog-old index c3b41e2..b5d44d5 100644 --- a/ChangeLog-old +++ b/ChangeLog-old @@ -882,7 +882,7 @@ Wed May 13 18:06:17 CEST 2009 Daniel Veillard <veillard(a)redhat.com> Wed May 13 12:34:06 BST 2009 Daniel P. Berrange <berrange(a)redhat.com> * src/lxc_container.c: Replace sys/capability.h with - linux/capability.h, to avoid unneccessary dependancy + linux/capability.h, to avoid unnecessary dependency on the libcap package. Tue May 12 16:39:06 EDT 2009 Cole Robinson <crobinso(a)redhat.com> @@ -3351,7 +3351,7 @@ Tue Jan 20 20:22:53 GMT 2009 Daniel P. Berrange <berrange(a)redhat.com> Tue Jan 20 19:49:53 GMT 2009 Daniel P. Berrange <berrange(a)redhat.com> * .x-sc_prohibit_nonreentrant: Blacklist some places where - use of non-threadsafe APIs are not neccessary to check + use of non-threadsafe APIs are not necessary to check * Makefile.am, Makefile.maint, Makefile.nonreentrant: Add check for non-reentrant safe API calls * Makefile.cfg: Temporarily disable non-reentrant check @@ -3591,7 +3591,7 @@ Thu Jan 15 19:54:19 GMT 2009 Daniel P. Berrange <berrange(a)redhat.com> * src/Makefile.am, src/threads.c, src/threads.h: Generic internal API for threads * src/threads-pthread.c, src/threads-pthread.h: UNIX pthreads impl * src/threads-win32.c, src/threads-win32.h: Win32 threads impl - * src/internal.h: Remove unnneccessary pthreads macros + * src/internal.h: Remove unnecessary pthreads macros * src/libvirt_private.syms: Add symbols for internal threads API * po/POTFILES.in: Add node_device_conf.c * proxy/Makefile.am: Add threads.c to build @@ -4262,7 +4262,7 @@ Thu Dec 18 11:50:58 GMT 2008 Daniel P. Berrange <berrange(a)redhat.com> Misc daemon bug fixes (John Levon) * qemud/qemud.c: Fix conditional for node devices - * qemud/remote.c: Remove unneccessary path.h include + * qemud/remote.c: Remove unnecessary path.h include Thu Dec 18 07:47:58 +0100 2008 Jim Meyering <meyering(a)redhat.com> @@ -5032,7 +5032,7 @@ Tue Nov 25 11:17:40 GMT 2008 Daniel P. Berrange <berrange(a)redhat.com> Tue Nov 25 10:49:40 GMT 2008 Daniel P. Berrange <berrange(a)redhat.com> - * src/Makefile.am: Remove unneccessary $(builddir) usage which + * src/Makefile.am: Remove unnecessary $(builddir) usage which breaks on older automake. Remove duplicate CFLAGS from merge error * src/xen_unified.c: Wire up XM driver for autostart @@ -5093,7 +5093,7 @@ Mon Nov 24 19:22:40 GMT 2008 Daniel P. Berrange <berrange(a)redhat.com> * tests/Makefile.am, tests/sexpr2xmltest.c, tests/testutilsxen.c, tests/xencapstest.c, tests/xmconfigtest.c, tests/xml2sexprtest.c: Disable all - Xen tests when Xen driver build is disabled. Remove unneccessary + Xen tests when Xen driver build is disabled. Remove unnecessary WITH_XEN conditionals from source, since the entire build is disabled in Makefile.am @@ -6822,7 +6822,7 @@ Wed Aug 20 21:05:09 BST 2008 Daniel P. Berrange <berrange(a)redhat.com> src/xen_unified.h, src/xend_internal.c, src/xend_internal.h, src/xm_internal.c, src/xs_internal.c, src/xs_internal.h tests/testutils.h: Remove preprocessor conditions for driver - compilation. Remove unneccessary "extern C" declarations. + compilation. Remove unnecessary "extern C" declarations. Wed Aug 20 20:42:09 BST 2008 Daniel P. Berrange <berrange(a)redhat.com> @@ -7008,7 +7008,7 @@ Fri Aug 8 16:41:24 BST 2008 Daniel Berrange <berrange(a)redhat.com> src/storage_backend_fs.c, src/storage_backend_iscsi.c, src/storage_backend_logical.c, src/util.c, src/util.h, src/veth.c, tests/qemuxml2argvtest.c: Fix const-correctness - of virRun and virExec, and remove unneccessary casts in callers + of virRun and virExec, and remove unnecessary casts in callers Fri Aug 8 16:53:24 CEST 2008 Daniel Veillard <veillard(a)redhat.com> @@ -7530,7 +7530,7 @@ Wed Jul 16 16:44:27 CEST 2008 Daniel Veillard <veillard(a)redhat.com> Sat Jul 12 14:52:59 BST 2008 Daniel P. Berrange <berrange(a)redhat.com> - * src/qemu_conf.c: Remove unneccessary c-ctype.h include + * src/qemu_conf.c: Remove unnecessary c-ctype.h include Fri Jul 11 20:32:59 BST 2008 Daniel P. Berrange <berrange(a)redhat.com> @@ -8612,7 +8612,7 @@ Thu May 1 14:10:28 EST 2008 Daniel P. Berrange <berrange(a)redhat.com> Tue Apr 29 12:32:28 EST 2008 Daniel P. Berrange <berrange(a)redhat.com> - * configure.in: Remove compatability macros AC_CHECK_*_ONCE for + * configure.in: Remove compatibility macros AC_CHECK_*_ONCE for now part of onceonly.m4 in gnulib/m4/ Wed Apr 29 18:10:00 CEST 2008 Jim Meyering <meyering(a)redhat.com> @@ -8628,7 +8628,7 @@ Wed Apr 29 18:10:00 CEST 2008 Jim Meyering <meyering(a)redhat.com> Tue Apr 29 11:54:28 EST 2008 Daniel P. Berrange <berrange(a)redhat.com> - * configure.in: Add compatability macros AC_CHECK_*_ONCE for + * configure.in: Add compatibility macros AC_CHECK_*_ONCE for older autoconf (RHEL-5 vintage) Tue Apr 29 08:13:28 EST 2008 Daniel P. Berrange <berrange(a)redhat.com> @@ -10247,7 +10247,7 @@ Fri Jan 25 12:00:00 BST 2008 Richard W.M. Jones <rjones(a)redhat.com> Fri Jan 25 10:46:32 CET 2008 Daniel Veillard <veillard(a)redhat.com> - * src/xen_internal.c: fix an erronous use of VIR_DOMAIN_NONE instead + * src/xen_internal.c: fix an erroneous use of VIR_DOMAIN_NONE instead of VIR_DOMAIN_NOSTATE (both defined as 0, no regression) Thu Jan 24 18:08:28 CET 2008 Daniel Veillard <veillard(a)redhat.com> @@ -10283,8 +10283,8 @@ Tue Jan 22 16:27:47 EST 2008 Daniel P. Berrange <berrange(a)redhat.com> * configure.ac: Remove use of PKG_CHECK_EXISTS macro. Avoid lines going over 80 chars wide. Make sasl check automatic - enable/disable as neccessary. - * acinclude.m4: Added compatability macro for old pkg-config + enable/disable as necessary. + * acinclude.m4: Added compatibility macro for old pkg-config * src/gnutls_1_0_compat.h: Add compat for gnutls_cipher_algorithm_t Mon Jan 21 18:03:47 CET 2008 Jim Meyering <meyering(a)redhat.com> @@ -11617,7 +11617,7 @@ Tue Oct 23 17:30:52 CEST 2007 Daniel Veillard <veillard(a)redhat.com> Mon Oct 22 22:33:59 CEST 2007 Daniel Veillard <veillard(a)redhat.com> * src/xen_internal.c src/xen_unified.c src/xen_unified.h - src/xend_internal.c src/xml.c src/xml.h: commited erronously + src/xend_internal.c src/xml.c src/xml.h: committed erroneously the NUMA patches sent for review on the list in last commit. But that should not affect non NUMA users so early push should not be a problem. @@ -12117,7 +12117,7 @@ Mon Aug 13 21:18:48 EST 2007 Daniel P. Berrange <berrange(a)redhat.com> * src/util.h, src/util.c: Allow a file descriptor to be supplied for STDIN when calling virExec(), or if -1, redirect from /dev/null * src/qemu_driver.c, src/openvz_driver.c: Pass in -1 for new stdin - parameter above where neccessary. Patch from Jim Paris + parameter above where necessary. Patch from Jim Paris Mon Aug 13 20:13:48 EST 2007 Daniel P. Berrange <berrange(a)redhat.com> @@ -15485,7 +15485,7 @@ Fri Aug 4 20:19:23 EDT 2006 Daniel Berrange <berrange(a)redhat.com> * src/libvirt.c: Fix off-by-one in validated VCPU number (it is zero based, not one based). * include/libvirt/libvirt.h: Add some convenience macros for - calculating neccessary CPU map lengths & total host CPUs + calculating necessary CPU map lengths & total host CPUs * src/virsh.c: Add 'vcpuinfo' and 'vcpumap' commands Fri Aug 4 14:45:25 CEST 2006 Daniel Veillard <veillard(a)redhat.com> @@ -15708,7 +15708,7 @@ Wed Jun 14 13:10:03 EDT 2006 Daniel Veillard <veillard(a)redhat.com> Tue Jun 13 14:06:01 EDT 2006 Daniel P. Berrange <berrange(a)redhat.com> * src/virsh.c: use 'double' instead of 'float' when calculating - 'CPU time' field for dominfo command, to ensure no unneccessary + 'CPU time' field for dominfo command, to ensure no unnecessary loss of precision converting from nanoseconds to seconds. Tue Jun 13 18:35:22 EDT 2006 Daniel Veillard <veillard(a)redhat.com> diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 47837d1..c817a9b 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -35,7 +35,7 @@ mount them use: <p> NB, the blkio controller in some kernels will not allow creation of nested sub-directories which will prevent correct operation of the libvirt LXC -driver. On such kernels, it may be neccessary to unmount the blkio controller. +driver. On such kernels, it may be necessary to unmount the blkio controller. </p> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 6bf64a6..284e780 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2885,8 +2885,8 @@ qemu-kvm -net nic,model=? /dev/null <dl> <dt><code>video</code></dt> <dd> - The <code>video</code> element is the a container for describing - video devices. For backwards compatability, if no <code>video</code> + The <code>video</code> element is the container for describing + video devices. For backwards compatibility, 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. For a guest of type "kvm", the default <code>video</code> for it is: diff --git a/docs/locking.html.in b/docs/locking.html.in index 5a64453..28781a4 100644 --- a/docs/locking.html.in +++ b/docs/locking.html.in @@ -76,7 +76,7 @@ <p> The sanlock daemon must be started on every single host that will be running virtual machines. So repeat these - steps as neccessary. + steps as necessary. </p> <h2><a name="sanlockplugin">libvirt sanlock plugin configuration</a></h2> diff --git a/docs/migration.html.in b/docs/migration.html.in index 3676f0b..9d9d9b9 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -25,7 +25,7 @@ on the hypervisor in question, but will typically have the lowest computational costs by minimising the number of data copies involved. The native data transports will also require extra hypervisor-specific network configuration steps by the administrator when - deploying a host. For some hypervisors, it might be neccessary to open up a large range + deploying a host. For some hypervisors, it might be necessary to open up a large range of ports on the firewall to allow multiple concurrent migration operations. </p> diff --git a/docs/news.html.in b/docs/news.html.in index c8365d9..f8e07f1 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -5471,7 +5471,7 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> qemu: Search binaries in PATH instead of hardcoding /usr/bin (Matthias Bolte),<br/> Implement QMP support for extracting CPU thread ID (Daniel P. Berrange),<br/> Misc fixes to QMP monitor support for QEMU (Daniel P. Berrange),<br/> - Fix setup of compatability serial devices from console device (Daniel P. Berrange),<br/> + Fix setup of compatibility serial devices from console device (Daniel P. Berrange),<br/> Start modernizing configure (Eric Blake),<br/> Add a rule to check for uses of readlink. (Chris Lalancette),<br/> Add virConnectGetVersion Python API (Taizo ITO),<br/> @@ -6025,7 +6025,7 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> Fix a typo in virDiskHasValidPciAddr() (Jiri Denemark),<br/> Fix a number of small typos (Dan Kenigsberg),<br/> add doc for graphic and video elements (Florian Vichot),<br/> - Fix up 'neccessary -> necessary' in a comment. (Chris Lalancette),<br/> + Fix up 'necessary -> necessary' in a comment. (Chris Lalancette),<br/> Fix up comments for domainXML{To,From}Native. (Chris Lalancette),<br/> Simple fix of a comment in qemuStringToArgvEnv. (Chris Lalancette),<br/> Add a README file to src/ explaining the directory structure (Daniel P. Berrange),<br/> @@ -6125,7 +6125,7 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> Pull connection handling code out of doTunnelMigrate (Daniel P. Berrange),<br/> Refactor native QEMU migration code (Daniel P. Berrange),<br/> Don't force dconn to be NULL in virDomainMigrate (Daniel P. Berrange),<br/> - Remove unneccessary uri_in parameter from virMigratePrepareTunnel (Daniel P. Berrange),<br/> + Remove unnecessary uri_in parameter from virMigratePrepareTunnel (Daniel P. Berrange),<br/> Move the VIR_DRV_FEATURE* constants (Daniel P. Berrange),<br/> Fix configure.ac message vertical alignment (Daniel P. Berrange),<br/> cgroup: Fix -Werror breakage (Cole Robinson),<br/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 26e24f0..dcb9549 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2970,7 +2970,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, /* People sometimes pass a bogus '' source path when they mean to omit the source element completely. eg CDROM without media. This is - just a little compatability check to help + just a little compatibility check to help those broken apps */ if (source && STREQ(source, "")) VIR_FREE(source); @@ -8002,7 +8002,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, } VIR_FREE(nodes); - /* For backwards compatability, if no <video> tag is set but there + /* For backwards compatibility, if no <video> tag is set but there * is a <graphics> tag, then we add a single video tag */ if (def->ngraphics && !def->nvideos) { virDomainVideoDefPtr video; @@ -9531,7 +9531,7 @@ virDomainDefMaybeAddSmartcardController(virDomainDefPtr def) /* * Based on the declared <address/> info for any devices, - * add neccessary drive controllers which are not already present + * add necessary drive controllers which are not already present * in the XML. This is for compat with existing apps which will * not know/care about <controller> info in the XML */ diff --git a/src/libvirt.c b/src/libvirt.c index e8473c2..11e2635 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -16577,7 +16577,7 @@ error: * is non-NULL, then only the specific domain will be monitored * * Most types of event have a callback providing a custom set of parameters - * for the event. When registering an event, it is thus neccessary to use + * for the event. When registering an event, it is thus necessary to use * the VIR_DOMAIN_EVENT_CALLBACK() macro to cast the supplied function pointer * to match the signature of this method. * diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 1c148e2..04af39b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -432,7 +432,7 @@ static int lxcContainerMountBasicFS(const char *srcprefix, bool pivotRoot) int mflags; } mnts[] = { /* When we want to make a bind mount readonly, for unknown reasons, - * it is currently neccessary to bind it once, and then remount the + * it is currently necessary to bind it once, and then remount the * bind with the readonly flag. If this is not done, then the original * mount point in the main OS becomes readonly too which is not what * we want. Hence some things have two entries here. diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8453a47..6e8ea98 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1317,7 +1317,7 @@ qemuMigrationPrepareDirect(struct qemud_driver *driver, /* XXX this really should have been a properly well-formed * URI, but we can't add in tcp:// now without breaking - * compatability with old targets. We at least make the + * compatibility with old targets. We at least make the * new targets accept both syntaxes though. */ /* Caller frees */ diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index d2ede6b..7f589c8 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -384,7 +384,7 @@ virNetServerProgramDispatchCall(virNetServerProgramPtr prog, if (virNetServerClientNeedAuth(client) && dispatcher->needAuth) { /* Explicitly *NOT* calling remoteDispatchAuthError() because - we want back-compatability with libvirt clients which don't + we want back-compatibility with libvirt clients which don't support the VIR_ERR_AUTH_FAILED error code */ virNetError(VIR_ERR_RPC, "%s", _("authentication required")); diff --git a/src/util/virterror.c b/src/util/virterror.c index edd5198..fb5ca6f 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -228,7 +228,7 @@ virErrorGenericFailure(virErrorPtr err) /* - * Internal helper to perform a deep copy of the an error + * Internal helper to perform a deep copy of an error */ static int virCopyError(virErrorPtr from, @@ -439,7 +439,7 @@ virResetLastError(void) * Since 0.6.0, all errors reported in the per-connection object * are also duplicated in the global error object. As such an * application can always use virGetLastError(). This method - * remains for backwards compatability. + * remains for backwards compatibility. * * Returns a pointer to the last error or NULL if none occurred. */ @@ -470,7 +470,7 @@ virConnGetLastError(virConnectPtr conn) * Since 0.6.0, all errors reported in the per-connection object * are also duplicated in the global error object. As such an * application can always use virGetLastError(). This method - * remains for backwards compatability. + * remains for backwards compatibility. * * One will need to free the result with virResetError() * @@ -683,7 +683,7 @@ virRaiseErrorFull(const char *filename ATTRIBUTE_UNUSED, /* * All errors are recorded in thread local storage - * For compatability, public API calls will copy them + * For compatibility, public API calls will copy them * to the per-connection error object when necessary */ to = virLastErrorObject(); diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 756eb77..f8390ea 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -651,7 +651,7 @@ xenParseSxprSound(virDomainDefPtr def, int i; /* - * Special compatability code for Xen with a bogus + * Special compatibility code for Xen with a bogus * sound=all in config. * * NB deliberately, don't include all possible -- 1.7.1

2 1

[libvirt] [PATCH v4] npiv: Auto-generate WWN if it's not specified
by Osier Yang 03 Feb '12

03 Feb '12

The auto-generated WWN comply with the new addressing schema of WWN: <quote> the first nibble is either hex 5 or 6 followed by a 3-byte vendor identifier and 36 bits for a vendor-specified serial number. </quote> We choose hex 5 for the first nibble. And use Qumranet's OUI (00:1A:4A) as the 3-byte vendor indentifier. The last 36 bits are auto-generated. v3 - v4: * No changes, rebasing according the files reorgnization. --- src/conf/node_device_conf.c | 35 ++++++++++++++++++----------------- src/libvirt_private.syms | 1 + src/util/virrandom.c | 25 +++++++++++++++++++++++++ src/util/virrandom.h | 1 + 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index d9dc9ac..6812ee9 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -63,19 +63,12 @@ VIR_ENUM_IMPL(virNodeDevHBACap, VIR_NODE_DEV_CAP_HBA_LAST, static int virNodeDevCapsDefParseString(const char *xpath, xmlXPathContextPtr ctxt, - char **string, - virNodeDeviceDefPtr def, - const char *missing_error_fmt) + char **string) { char *s; - s = virXPathString(xpath, ctxt); - if (s == NULL) { - virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, - missing_error_fmt, - def->name); + if (!(s = virXPathString(xpath, ctxt))) return -1; - } *string = s; return 0; @@ -763,18 +756,26 @@ virNodeDevCapScsiHostParseXML(xmlXPathContextPtr ctxt, if (virNodeDevCapsDefParseString("string(./wwnn[1])", ctxt, - &data->scsi_host.wwnn, - def, - _("no WWNN supplied for '%s'")) < 0) { - goto out; + &data->scsi_host.wwnn) < 0) { + if (virWWNGenerate(&data->scsi_host.wwnn) < 0) { + virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, + _("no WWNN supplied for '%s', and " + "auto-generation failed"), + def->name); + goto out; + } } if (virNodeDevCapsDefParseString("string(./wwpn[1])", ctxt, - &data->scsi_host.wwpn, - def, - _("no WWPN supplied for '%s'")) < 0) { - goto out; + &data->scsi_host.wwpn) < 0) { + if (virWWNGenerate(&data->scsi_host.wwpn) < 0) { + virNodeDeviceReportError(VIR_ERR_INTERNAL_ERROR, + _("no WWPN supplied for '%s', and " + "auto-generation failed"), + def->name); + goto out; + } } ctxt->node = orignode2; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e300f06..0d5758f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1374,6 +1374,7 @@ virPidFileDeletePath; # virrandom.h virRandomBits; virRandomInitialize; +virWWNGenerate; # virsocketaddr.h diff --git a/src/util/virrandom.c b/src/util/virrandom.c index ec0cf03..3839989 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -26,6 +26,10 @@ #include "virrandom.h" #include "threads.h" #include "count-one-bits.h" +#include "util.h" +#include "virterror_internal.h" + +#define VIR_FROM_THIS VIR_FROM_NONE static char randomState[128]; static struct random_data randomData; @@ -79,3 +83,24 @@ uint64_t virRandomBits(int nbits) virMutexUnlock(&randomLock); return ret; } + +#define QUMRANET_OUI "001a4a" + +int virWWNGenerate(char **wwn) { + int suffix[5]; + + suffix[0] = virRandomBits(16); + suffix[1] = virRandomBits(256); + suffix[2] = virRandomBits(256); + suffix[3] = virRandomBits(256); + suffix[4] = virRandomBits(256); + + if (virAsprintf(wwn, "%x%s%x%02x%02x%02x%02x", 0x5, QUMRANET_OUI, + suffix[0], suffix[1], suffix[2], + suffix[3], suffix[4]) < 0) { + virReportOOMError(); + return -1; + } + + return 0; +} diff --git a/src/util/virrandom.h b/src/util/virrandom.h index e180a2f..5e2cdcf 100644 --- a/src/util/virrandom.h +++ b/src/util/virrandom.h @@ -27,5 +27,6 @@ int virRandomInitialize(uint32_t seed) ATTRIBUTE_RETURN_CHECK; uint64_t virRandomBits(int nbits); +int virWWNGenerate(char **wwn); #endif /* __VIR_RANDOM_H__ */ -- 1.7.7.3

2 2

[libvirt] [PATCH] Added missing memory reporting into python bindings
by Martin Kletzander 03 Feb '12

03 Feb '12

Two types of memory stats were not reported by python bindings. This patch fixes both of them. --- python/libvirt-override.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 18849f8..289a9bb 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -258,6 +258,12 @@ libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_AVAILABLE) PyDict_SetItem(info, libvirt_constcharPtrWrap("available"), PyLong_FromUnsignedLongLong(stats[i].val)); + else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON) + PyDict_SetItem(info, libvirt_constcharPtrWrap("actual"), + PyLong_FromUnsignedLongLong(stats[i].val)); + else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_RSS) + PyDict_SetItem(info, libvirt_constcharPtrWrap("rss"), + PyLong_FromUnsignedLongLong(stats[i].val)); } return info; } -- 1.7.3.4

2 1

[libvirt] [PATCH 0/5] switch python bindings to use libvirt_util
by Eric Blake 03 Feb '12

03 Feb '12

As threatened here: https://www.redhat.com/archives/libvir-list/2012-February/msg00122.html and as requested here: https://www.redhat.com/archives/libvir-list/2012-January/msg00491.html along with some prerequisite patches. I was quite shocked when I discovered that we didn't have a syntax-check rule requiring the use of VIR_FREE, before these patches. Eric Blake (5): build: clean up CPPFLAGS/INCLUDES usage python: drop redundant function build: prohibit raw malloc and free build: expand rule to cover testsuite python: use libvirt_util to avoid raw free cfg.mk | 9 + daemon/Makefile.am | 20 +- examples/dominfo/Makefile.am | 4 +- examples/domsuspend/Makefile.am | 4 +- examples/hellolibvirt/Makefile.am | 4 +- examples/openauth/Makefile.am | 4 +- python/Makefile.am | 22 ++- python/generator.py | 4 +- python/libvirt-override.c | 364 ++++++++++++++++++------------------- python/typewrappers.c | 21 +-- python/typewrappers.h | 3 +- src/Makefile.am | 70 ++++---- src/conf/network_conf.c | 2 +- src/cpu/cpu.c | 4 +- src/libxl/libxl_conf.c | 13 +- src/rpc/virnetmessage.c | 23 ++- tests/Makefile.am | 9 +- tests/commandhelper.c | 6 +- tests/cputest.c | 36 ++-- tests/domainsnapshotxml2xmltest.c | 6 +- tests/interfacexml2xmltest.c | 6 +- tests/networkxml2argvtest.c | 10 +- tests/networkxml2xmltest.c | 10 +- tests/nodedevxml2xmltest.c | 6 +- tests/nodeinfotest.c | 10 +- tests/nwfilterxml2xmltest.c | 10 +- tests/qemuargv2xmltest.c | 20 +- tests/qemuxml2argvtest.c | 28 ++-- tests/qemuxml2xmltest.c | 10 +- tests/qemuxmlnstest.c | 23 ++- tests/qparamtest.c | 2 +- tests/sexpr2xmltest.c | 10 +- tests/storagepoolxml2xmltest.c | 10 +- tests/storagevolxml2xmltest.c | 14 +- tests/testutils.c | 9 +- tests/testutils.h | 3 +- tests/virshtest.c | 4 +- tests/xencapstest.c | 10 +- tests/xmconfigtest.c | 10 +- tests/xml2sexprtest.c | 10 +- tools/Makefile.am | 12 +- tools/virsh.c | 9 +- 42 files changed, 429 insertions(+), 435 deletions(-) -- 1.7.7.6

2 11

[libvirt] need help in vm migration
by punit gupta 03 Feb '12

03 Feb '12

sir i am using fedora 14 and libvirt 0.8 and qemu 13 ,and i am trying to migrate my vm using virt-manager but it is giving error . >> internal error Process exited while reading console log output: char device redirected to /dev/pts/1 qemu: could not open disk image /home/punit/qemu/dos1.img: No such file or directory where as file is present in the directry . please help -- Punit Gupta M-Tech (C.S.E) (jiit noida)

3 2

[libvirt] [PATCH] command: allow merging stdout and stderr in string capture
by Eric Blake 03 Feb '12

03 Feb '12

Sometimes, its easier to run children with 2>&1 in shell notation, and just deal with stdout and stderr interleaved. This was already possible for fd handling; extend it to also work when doing string capture of a child process. * docs/internals/command.html.in: Document this. * src/util/command.c (virCommandSetErrorBuffer): Likewise. (virCommandRun, virExecWithHook): Implement it. * tests/commandtest.c (test14): Test it. * daemon/remote.c (remoteDispatchAuthPolkit): Use new command feature. --- In response to: https://www.redhat.com/archives/libvir-list/2012-January/msg01262.html Hmm, I thought I sent this earlier, but can't find it on the archives. daemon/remote.c | 11 +++-------- docs/internals/command.html.in | 5 ++++- src/util/command.c | 16 ++++++++++++++-- tests/commandtest.c | 26 +++++++++++++++++++++++++- 4 files changed, 46 insertions(+), 12 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 26ac4a6..1cea942 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2477,7 +2477,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, int status = -1; char *ident = NULL; bool authdismissed = 0; - char *pkout = NULL, *pkerr = NULL; + char *pkout = NULL; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); virCommandPtr cmd = NULL; @@ -2489,7 +2489,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, cmd = virCommandNewArgList(PKCHECK_PATH, "--action-id", action, NULL); virCommandSetOutputBuffer(cmd, &pkout); - virCommandSetErrorBuffer(cmd, &pkerr); + virCommandSetErrorBuffer(cmd, &pkout); VIR_DEBUG("Start PolicyKit auth %d", virNetServerClientGetFD(client)); if (virNetServerClientGetAuth(client) != VIR_NET_SERVER_SERVICE_AUTH_POLKIT) { @@ -2548,17 +2548,12 @@ error: if (authdismissed) { virNetError(VIR_ERR_AUTH_CANCELLED, "%s", _("authentication cancelled by user")); - } else if (pkout || pkerr) { - virNetError(VIR_ERR_AUTH_FAILED, "%s %s", - pkerr ? pkerr : "", - pkout ? pkout : ""); } else { virNetError(VIR_ERR_AUTH_FAILED, "%s", - _("authentication failed")); + pkout && *pkout ? pkout : _("authentication failed")); } VIR_FREE(pkout); - VIR_FREE(pkerr); virNetMessageSaveError(rerr); virMutexUnlock(&priv->lock); return -1; diff --git a/docs/internals/command.html.in b/docs/internals/command.html.in index 7dcf462..7bb9aa3 100644 --- a/docs/internals/command.html.in +++ b/docs/internals/command.html.in @@ -373,7 +373,10 @@ allocation of collected information (however, on an out-of-memory condition, the buffer may still be NULL). The caller is responsible for freeing registered buffers, since the - buffers are designed to persist beyond virCommandFree. + buffers are designed to persist beyond virCommandFree. It + is possible to pass the same pointer to both + virCommandSetOutputBuffer and virCommandSetErrorBuffer, in which + case the child process interleaves output into a single string. </p> <h3><a name="directory">Setting working directory</a></h3> diff --git a/src/util/command.c b/src/util/command.c index 6f51fbb..a2d5f84 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -464,7 +464,9 @@ virExecWithHook(const char *const*argv, } if (errfd != NULL) { - if (*errfd == -1) { + if (errfd == outfd) { + childerr = childout; + } else if (*errfd == -1) { if (pipe2(pipeerr, O_CLOEXEC) < 0) { virReportSystemError(errno, "%s", _("Failed to create pipe")); @@ -1428,7 +1430,10 @@ virCommandSetOutputBuffer(virCommandPtr cmd, char **outbuf) * guaranteed to be allocated after successful virCommandRun or * virCommandWait, and is best-effort allocated after failed * virCommandRun; caller is responsible for freeing *errbuf. - * This requires the use of virCommandRun. + * This requires the use of virCommandRun. It is possible to + * pass the same pointer as for virCommandSetOutputBuffer(), in + * which case the child process will interleave all output into + * a single string. */ void virCommandSetErrorBuffer(virCommandPtr cmd, char **errbuf) @@ -1940,6 +1945,13 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) cmd->inpipe = infd[1]; } + /* If caller requested the same string for stdout and stderr, then + * merge those into one string. */ + if (cmd->outbuf && cmd->outbuf == cmd->errbuf) { + cmd->errfdptr = &cmd->outfd; + cmd->errbuf = NULL; + } + /* If caller hasn't requested capture of stdout/err, then capture * it ourselves so we can log it. But the intermediate child for * a daemon has no expected output, and we don't want our diff --git a/tests/commandtest.c b/tests/commandtest.c index 9b9130c..3997d2c 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -508,6 +508,14 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) const char *errexpect = "BEGIN STDERR\n" "Hello World\n" "END STDERR\n"; + + char *jointactual = NULL; + const char *jointexpect = "BEGIN STDOUT\n" + "BEGIN STDERR\n" + "Hello World\n" + "Hello World\n" + "END STDOUT\n" + "END STDERR\n"; int ret = -1; virCommandSetInputBuffer(cmd, "Hello World\n"); @@ -523,7 +531,18 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) goto cleanup; virCommandFree(cmd); - cmd = NULL; + + cmd = virCommandNew(abs_builddir "/commandhelper"); + virCommandSetInputBuffer(cmd, "Hello World\n"); + virCommandSetOutputBuffer(cmd, &jointactual); + virCommandSetErrorBuffer(cmd, &jointactual); + if (virCommandRun(cmd, NULL) < 0) { + virErrorPtr err = virGetLastError(); + printf("Cannot run child %s\n", err->message); + goto cleanup; + } + if (!jointactual) + goto cleanup; if (!STREQ(outactual, outexpect)) { virtTestDifference(stderr, outexpect, outactual); @@ -533,6 +552,10 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) virtTestDifference(stderr, errexpect, erractual); goto cleanup; } + if (!STREQ(jointactual, jointexpect)) { + virtTestDifference(stderr, jointexpect, jointactual); + goto cleanup; + } ret = checkoutput("test14"); @@ -540,6 +563,7 @@ cleanup: virCommandFree(cmd); VIR_FREE(outactual); VIR_FREE(erractual); + VIR_FREE(jointactual); return ret; } -- 1.7.7.6

2 2

[libvirt] [PATCH] virsh: extension of virsh attach-disk for rawio
by Taku Izumi 03 Feb '12

03 Feb '12

This patch extends "virsh attach-disk" command so that we can specify "rawio" attribute. Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- tools/virsh.c | 3 +++ tools/virsh.pod | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) Index: libvirt/tools/virsh.c =================================================================== --- libvirt.orig/tools/virsh.c +++ libvirt/tools/virsh.c @@ -13883,6 +13883,7 @@ static const vshCmdOptDef opts_attach_di {"sourcetype", VSH_OT_STRING, 0, N_("type of source (block|file)")}, {"serial", VSH_OT_STRING, 0, N_("serial of disk device")}, {"shareable", VSH_OT_BOOL, 0, N_("shareable between domains")}, + {"rawio", VSH_OT_BOOL, 0, N_("needs rawio capability")}, {"address", VSH_OT_STRING, 0, N_("address of disk device")}, {"multifunction", VSH_OT_BOOL, 0, N_("use multifunction pci under specified address")}, @@ -14102,6 +14103,8 @@ cmdAttachDisk(vshControl *ctl, const vsh (isFile) ? "file" : "block"); if (type) virBufferAsprintf(&buf, " device='%s'", type); + if (vshCommandOptBool (cmd, "rawio")) + virBufferAddLit(&buf, " rawio='yes'"); virBufferAddLit(&buf, ">\n"); if (driver || subdriver) Index: libvirt/tools/virsh.pod =================================================================== --- libvirt.orig/tools/virsh.pod +++ libvirt/tools/virsh.pod @@ -1404,7 +1404,7 @@ the device does not use managed mode. =item B<attach-disk> I<domain-id> I<source> I<target> [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] [I<--type type>] [I<--mode mode>] [I<--persistent>] [I<--sourcetype soucetype>] -[I<--serial serial>] [I<--shareable>] [I<--address address>] +[I<--serial serial>] [I<--shareable>] [I<--rawio>] [I<--address address>] [I<--multifunction>] Attach a new disk device to the domain. @@ -1421,6 +1421,7 @@ I<cache> can be one of "default", "none" "directsync" or "unsafe". I<serial> is the serial of disk device. I<shareable> indicates the disk device is shareable between domains. +I<rawio> indicates the disk is needs rawio capability. I<address> is the address of disk device in the form of pci:domain.bus.slot.function, scsi:controller.bus.unit or ide:controller.bus.unit. I<multifunction> indicates specified pci address is a multifunction pci device -- Taku Izumi <izumi.taku(a)jp.fujitsu.com>

3 2

[libvirt] [PATCH] qemu: fix my typo at commit 74e034964c32edb1732d0ff7642f3977f3587d72
by Taku Izumi 03 Feb '12

03 Feb '12

Fix my typo at commit 74e034964c32edb1732d0ff7642f3977f3587d72 "disk->rawio == -1" indicates that this value is not specified. So in case of this, domain must not be tainted. Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: libvirt/src/qemu/qemu_domain.c =================================================================== --- libvirt.orig/src/qemu/qemu_domain.c +++ libvirt/src/qemu/qemu_domain.c @@ -1260,7 +1260,7 @@ void qemuDomainObjCheckDiskTaint(struct driver->allowDiskFormatProbing) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_DISK_PROBING, logFD); - if (disk->rawio) + if (disk->rawio == 1) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HIGH_PRIVILEGES, logFD); }

3 3

[libvirt] [PATCH] Fixed connection definition for non-SELinux builds
by Martin Kletzander 03 Feb '12

03 Feb '12

This patch fixes the access of variable "con" in two files where the variable was declared only on SELinux builds and thus the build failed without SELinux. It's a rather nasty fix but helps fix the build quickly and without any major changes to the code. --- src/lxc/lxc_container.c | 2 ++ src/lxc/lxc_controller.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index d1156e4..1c148e2 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -449,6 +449,8 @@ static int lxcContainerMountBasicFS(const char *srcprefix, bool pivotRoot) char *opts = NULL; #if HAVE_SELINUX security_context_t con; +#else + bool con = false; #endif VIR_DEBUG("Mounting basic filesystems %s pivotRoot=%d", NULLSTR(srcprefix), pivotRoot); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index fedb7c8..8f336f5 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1438,6 +1438,8 @@ lxcControllerRun(virDomainDefPtr def, if (root) { #if HAVE_SELINUX security_context_t con; +#else + bool con = false; #endif char *opts; VIR_DEBUG("Setting up private /dev/pts"); -- 1.7.3.4

3 2

[libvirt] [PATCH 0/2] Added RSS reporting for qemu
by Martin Kletzander 03 Feb '12

03 Feb '12

This patch enables reporting of Resident Set Size for qemu process. It is available through qemudDomainMemoryStats and qemudGetProcessInfo. The reporting is also added into "virsh dommemstat" command. Martin Kletzander (2): Added RSS information gathering into qemudGetProcessInfo Added RSS reporting include/libvirt/libvirt.h.in | 7 +++++- src/qemu/qemu_driver.c | 46 +++++++++++++++++++++++++++++++---------- tools/virsh.c | 2 + 3 files changed, 43 insertions(+), 12 deletions(-) -- 1.7.3.4

2 7

[libvirt] [PATCH] Replace TAB with white spaces
by Osier Yang 03 Feb '12

03 Feb '12

--- src/libvirt.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index f58dfa6..e8473c2 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -8519,9 +8519,9 @@ error: * 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. + * underlying virtualization system (Xen...). + * If maplen < size, missing bytes are set to zero. + * If maplen > size, failure code is returned. * * Dynamically change the real CPUs which can be allocated to a virtual CPU. * This function may require privileged access to the hypervisor. @@ -8730,15 +8730,15 @@ error: * @maxinfo: number of structures in info array * @cpumaps: pointer to a bit map of real CPUs for all vcpus of this * domain (in 8-bit bytes) (OUT) - * If cpumaps is NULL, then no cpumap information is returned by the API. - * It's assumed there is <maxinfo> cpumap in cpumaps array. - * The memory allocated to cpumaps must be (maxinfo * maplen) bytes - * (ie: calloc(maxinfo, maplen)). - * One cpumap inside cpumaps has the format described in + * If cpumaps is NULL, then no cpumap information is returned by the API. + * It's assumed there is <maxinfo> cpumap in cpumaps array. + * The memory allocated to cpumaps must be (maxinfo * maplen) bytes + * (ie: calloc(maxinfo, maplen)). + * One cpumap inside cpumaps has the format described in * virDomainPinVcpu() API. * @maplen: number of bytes in one cpumap, from 1 up to size of CPU map in - * underlying virtualization system (Xen...). - * Must be zero when cpumaps is NULL and positive when it is non-NULL. + * underlying virtualization system (Xen...). + * Must be zero when cpumaps is NULL and positive when it is non-NULL. * * Extract information about virtual CPUs of domain, store it in info array * and also in cpumaps if this pointer isn't NULL. This call may fail @@ -11160,7 +11160,7 @@ virStoragePoolGetConnect (virStoragePoolPtr pool) * Returns the number of pools found, or -1 on error */ int -virConnectNumOfStoragePools (virConnectPtr conn) +virConnectNumOfStoragePools(virConnectPtr conn) { VIR_DEBUG("conn=%p", conn); @@ -11200,9 +11200,9 @@ error: * Returns 0 on success, -1 on error */ int -virConnectListStoragePools (virConnectPtr conn, - char **const names, - int maxnames) +virConnectListStoragePools(virConnectPtr conn, + char **const names, + int maxnames) { VIR_DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); -- 1.7.7.3

2 2

[libvirt] [PATCH] lxc: Fix build with AppArmor
by Jiri Denemark 03 Feb '12

03 Feb '12

--- src/Makefile.am | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b25a439..dd77eec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1526,6 +1526,9 @@ endif if WITH_SECDRIVER_SELINUX libvirt_lxc_LDADD += $(SELINUX_LIBS) endif +if WITH_SECDRIVER_APPARMOR +libvirt_lxc_LDADD += $(APPARMOR_LIBS) +endif libvirt_lxc_CFLAGS = \ $(LIBPARTED_CFLAGS) \ $(NUMACTL_CFLAGS) \ @@ -1541,6 +1544,9 @@ endif if WITH_SECDRIVER_SELINUX libvirt_lxc_CFLAGS += $(SELINUX_CFLAGS) endif +if WITH_SECDRIVER_APPARMOR +libvirt_lxc_CFLAGS += $(APPARMOR_CFLAGS) +endif endif endif EXTRA_DIST += $(LXC_CONTROLLER_SOURCES) -- 1.7.8.4

2 2

[libvirt] [PATCH] conf: Plug memory on virDomainDiskDefParseXML
by ajia＠redhat.com 03 Feb '12

03 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leak is introduced in commit 397e6a7. * src/conf/domain_conf.c(virDomainDiskDefParseXML): fix memory leak. How to reproduce? % make -C tests check TESTS=qemuxml2argvtest % cd tests && valgrind -v --leak-check=full ./qemuxml2argvtest * Actual result: ==16352== 4 bytes in 1 blocks are definitely lost in loss record 12 of 147 ==16352== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==16352== by 0x39D90A67DD: xmlStrndup (xmlstring.c:45) ==16352== by 0x4E83D5: virDomainDiskDefParseXML (domain_conf.c:2894) ==16352== by 0x4F542D: virDomainDefParseXML (domain_conf.c:7626) ==16352== by 0x4F8683: virDomainDefParseNode (domain_conf.c:8390) ==16352== by 0x4F904E: virDomainDefParse (domain_conf.c:8340) ==16352== by 0x41C626: testCompareXMLToArgvHelper (qemuxml2argvtest.c:105) ==16352== by 0x41DED1: virtTestRun (testutils.c:142) ==16352== by 0x418172: mymain (qemuxml2argvtest.c:486) ==16352== by 0x41D5C7: virtTestMain (testutils.c:697) ==16352== by 0x39CF01ECDC: (below main) (in /lib64/libc-2.12.so) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/conf/domain_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index aeef9db..26e24f0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3413,6 +3413,7 @@ cleanup: VIR_FREE(bus); VIR_FREE(type); VIR_FREE(snapshot); + VIR_FREE(rawio); VIR_FREE(target); VIR_FREE(source); while (nhosts > 0) { -- 1.7.1

2 1

[libvirt] [PATCH 1/1] Add detail to documentation on storage pools and volumes.
by Dave Allan 02 Feb '12

02 Feb '12

The storage pools page contains details about the capabilities of the various pool types, but not an overview of how they are intended to be used. This patch adds some explanation of what pools and volumes can be used for and why an administrator might want to use them. --- docs/storage.html.in | 82 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 79 insertions(+), 3 deletions(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index a9c7f1c..0e3e289 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -3,9 +3,85 @@ <body> <h1 >Storage Management</h1> <p> -This page describes the backends for the storage management capabilities in -libvirt. -</p> + Libvirt provides storage management on the physical host through + storage pools and volumes. + </p> + <p> + A storage pool is a quantity of storage set aside by an + administrator, often a dedicated storage administrator, for use + by virtual machines. Storage pools are divided into storage + volumes either by the storage administrator or the system + administrator, and the volumes are assigned to VMs as block + devices. + </p> + <p> + For example, the storage administrator responsible for an NFS + server creates a share to store virtual machines' data. The + system administrator defines a pool on the virtualization host + with the details of the share + (e.g. nfs.example.com:/path/to/share should be mounted on + /vm_data). When the pool is started, libvirt mounts the share + on the specified directory, just as if the system administrator + logged in and executed 'mount nfs.example.com:/path/to/share + /vmdata'. If the pool is configured to autostart, libvirt + ensures that the NFS share is mounted on the directory specified + when libvirt is started. + </p> + <p> + Once the pool is started, the files in the NFS share are + reported as volumes, and the storage volumes' paths may be + queried using the libvirt APIs. The volumes' paths can then be + copied into the section of a VM's XML definition describing the + source storage for the VM's block devices. In the case of NFS, + an application using the libvirt APIs can create and delete + volumes in the pool (files in the NFS share) up to the limit of + the size of the pool (the storage capacity of the share). Not + all pool types support creating and deleting volumes. Stopping + the pool (somewhat unfortunately referred to by virsh and the + API as "pool-destroy") undoes the start operation, in this case, + unmounting the NFS share. The data on the share is not modified + by the destroy operation, despite the name. See man virsh for + more details. + </p> + <p> + A second example is an iSCSI pool. A storage administrator + provisions an iSCSI target to present a set of LUNs to the host + running the VMs. When libvirt is configured to manage that + iSCSI target as a pool, libvirt will ensure that the host logs + into the iSCSI target and libvirt can then report the available + LUNs as storage volumes. The volumes' paths can be queried and + used in VM's XML definitions as in the NFS example. In this + case, the LUNs are defined on the iSCSI server, and libvirt + cannot create and delete volumes. + </p> + <p> + Storage pools and volumes are not required for the proper + operation of VMs. Pools and volumes provide a way for libvirt + to ensure that a particular piece of storage will be available + for a VM, but some administrators will prefer to manage their + own storage and VMs will operate properly without any pools or + volumes defined. On systems that do not use pools, system + administrators must ensure the availability of the VMs' storage + using whatever tools they prefer, for example, adding the NFS + share to the host's fstab so that the share is mounted at boot + time. + </p> + <p> + If at this point the value of pools and volumes over traditional + system administration tools is unclear, note that one of the + features of libvirt is its remote protocol, so it's possible to + manage all aspects of a virtual machine's lifecycle as well as + the configuration of the resources required by the VM. These + operations can be performed on a remote host entirely within the + libvirt API. In other words, a management application using + libvirt can enable a user to perform all the required tasks for + configuring the host for a VM: allocating resources, running the + VM, shutting it down and deallocating the resources, without + requiring shell access or any other control channel. + </p> + <p> + Libvirt supports the following storage pool types: + </p> <ul> <li> <a href="#StorageBackendDir">Directory backend</a> -- 1.7.7.6

2 1

[libvirt] [PATCH] tests: avoid test failure on rawhide gnutls
by Eric Blake 02 Feb '12

02 Feb '12

I hit a VERY weird testsuite failure on rawhide, which included _binary_ output to stderr, followed by a hang waiting for me to type something! (Here, using ^@ for NUL): $ ./commandtest TEST: commandtest WARNING: gnome-keyring:: couldn't send data: Bad file descriptor .WARNING: gnome-keyring:: couldn't send data: Bad file descriptor .WARNING: gnome-keyring:: couldn't send data: Bad file descriptor WARNING: gnome-keyring:: couldn't send data: Bad file descriptor .8^@^@^@8^@^@^@^A^@^@^@^Bay^A^@^@^@)PRIVATE-GNOME-KEYRING-PKCS11-PROTOCOL-V-1 I finally traced it to the fact that gnome-keyring, called via gnutls_global_init which is turn called by virNetTLSInit, opens an internal fd that it expects to communicate to via a pthread_atfork handler (never mind that it violates POSIX by using non-async-signal-safe functions in that handler: https://bugzilla.redhat.com/show_bug.cgi?id=772320) Our problem stems from the fact that we pulled the rug out from under the library's expectations by closing an fd that it had just opened. While we aren't responsible for fixing the bugs in that pthread_atfork handler, we can at least avoid the bugs by not closing the fd in the first place. * tests/commandtest.c (mymain): Avoid closing fds that were opened by virInitialize. --- Pushing under the build-breaker rule. It cost me the better part of a morning to track this one down, so I left a super-long comment to help the next person to read the file understand what we're fighting against. tests/commandtest.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index efc48fe..b4b6044 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -784,6 +784,22 @@ mymain(void) setpgid(0, 0); setsid(); + /* Our test expects particular fd values; to get that, we must not + * leak fds that we inherited from a lazy parent. At the same + * time, virInitialize may open some fds (perhaps via third-party + * libraries that it uses), and we must not kill off an fd that + * this process opens as it might break expectations of a + * pthread_atfork handler, as well as interfering with our tests + * trying to ensure we aren't leaking to our children. The + * solution is to do things in two phases - reserve the fds we + * want by overwriting any externally inherited fds, then + * initialize, then clear the slots for testing. */ + if ((fd = open("/dev/null", O_RDONLY)) < 0 || + dup2(fd, 3) < 0 || + dup2(fd, 4) < 0 || + dup2(fd, 5) < 0 || + (fd > 5 && VIR_CLOSE(fd) < 0)) + return EXIT_FAILURE; /* Prime the debug/verbose settings from the env vars, * since we're about to reset 'environ' */ @@ -791,8 +807,8 @@ mymain(void) virTestGetVerbose(); virInitialize(); - /* Kill off any inherited fds that might interfere with our - * testing. */ + + /* Phase two of killing interfering fds; see above. */ fd = 3; VIR_FORCE_CLOSE(fd); fd = 4; -- 1.7.7.5

3 3

[libvirt] [PATCH v3 0/7] Console corruption patchset
by Peter Krempa 02 Feb '12

02 Feb '12

This is the third version of this patchset, rebased, polisehd and tweaked after Eric's review. This series contains one new patch that enables reuse of code in patches later on. The qemu driver implementation of console handling is very similar to LXC's implementation, so porting this functionality to LXC should be trivial and I'll post a follow-up patch when the qemu's driver will be ok. Peter Krempa (7): pidfile: Make checking binary path in virPidFileRead optional Add flags for virDomainOpenConsole virsh: add support for VIR_DOMAIN_CONSOLE_* flags fdstream: Emit stream abort callback even if poll() doesnt. fdstream: Add internal callback on stream close util: Add helpers for safe domain console operations qemu: Add ability to abort existing console while creating new one configure.ac | 39 ++++- include/libvirt/libvirt.h.in | 12 ++ po/POTFILES.in | 1 + src/Makefile.am | 6 +- src/conf/virconsole.c | 396 ++++++++++++++++++++++++++++++++++++++++++ src/conf/virconsole.h | 36 ++++ src/fdstream.c | 89 +++++++++- src/fdstream.h | 11 ++ src/libvirt.c | 11 +- src/libvirt_private.syms | 6 + src/qemu/qemu_domain.c | 5 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 21 ++- src/util/virpidfile.c | 21 ++- tools/console.c | 5 +- tools/console.h | 3 +- tools/virsh.c | 24 ++- tools/virsh.pod | 8 +- 18 files changed, 660 insertions(+), 37 deletions(-) create mode 100644 src/conf/virconsole.c create mode 100644 src/conf/virconsole.h -- 1.7.3.4

2 13

[libvirt] link failure on RHEL 5
by Eric Blake 02 Feb '12

02 Feb '12

I haven't investigated what is missing in the Makefiles, but I'm getting link failures on RHEL 5: ../src/.libs/libvirt_driver_nwfilter.a(libvirt_driver_nwfilter_la-nwfilter_ebiptables_driver.o): In function `_printDataType': /home/dummy/libvirt/src/nwfilter/nwfilter_ebiptables_driver.c:306: undefined reference to `virMacAddrFormat' /home/dummy/libvirt/src/.libs/libvirt.so: undefined reference to `virMacAddrCompare' /home/dummy/libvirt/src/.libs/libvirt.so: undefined reference to `virMacAddrGenerate' -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 1

[libvirt] Small postpone of the 0.9.10 freeze
by Daniel Veillard 02 Feb '12

02 Feb '12

I'm finally back from vacation, and looking at the list it seems there is many patches floating that should be pushed for 0.9.10 . I suggest then to take a few more days to try to push patches especially about APIs, and enter the freeze on Monday instead. So we have a couple more working days to try to push features to git before 0.9.10 freeze, 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] [PATCHv3 0/4] API for modification of domain metadata
by Peter Krempa 02 Feb '12

02 Feb '12

This third version incorporates fixes of Eric's review and a rebase on the top of Jirka's new API. Differences to v2: xml: Add element <title> to allow short description of domains - Move <title> before <description> - fix tests to accomodate this - remove forgotten length limits from docs - fixed XML schema to work around libxml2 newline escape bug API: Add api to set and get domain metadata - added new remote procedures to remote_protocol-structs ( and installed tools to detect it in the future :( ) - Fixed function docs to accomodate new code semantics - Changed error message to sync with other API functions - Changed debug prints to print strings instead of pointers - Removed conditions forbidding expansion/work with newer versins - Changed RPC return type to nonnull_string virsh: Add support for modifying domain description and titles qemu: Add support for virDomainGetMetadata and virDomainSetMetadata - no changes docs/formatdomain.html.in | 8 +- docs/schemas/domaincommon.rng | 15 +- include/libvirt/libvirt.h.in | 24 ++ include/libvirt/virterror.h | 1 + src/conf/domain_conf.c | 11 + src/conf/domain_conf.h | 1 + src/driver.h | 16 ++ src/libvirt.c | 178 ++++++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_driver.c | 174 ++++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 24 ++- src/remote_protocol-structs | 19 ++ src/util/virterror.c | 6 + .../qemu-simple-description-title.xml | 27 ++ tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 5 + tools/virsh.c | 283 ++++++++++++++++++-- tools/virsh.pod | 34 +++- 18 files changed, 806 insertions(+), 24 deletions(-) create mode 100644 tests/domainschemadata/qemu-simple-description-title.xml -- 1.7.3.4

3 14

[libvirt] oVirt Live Snapshots
by Federico Simoncelli 02 Feb '12

02 Feb '12

Hi, oVirt, and more specifically VDSM, is currently implementing the live snapshot feature using the API/commands provided by libvirt and qemu. It would be great if you could review the design and the current open issues at: http://ovirt.org/wiki/Live_Snapshots Thank you, -- Federico

2 2

[libvirt] [PATCH] virsh: Plug memory leak on cmdUndefine
by ajia＠redhat.com 02 Feb '12

02 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leak is introduced in commit 3bb6bcf. Free 'vol' memory before allocating memory, the codes will miss one time free when 'vol_i = nvolumes' in for loop, so plug memory leak. * tools/virsh.c: fix memory leak on cmdUndefine. * How to reproduce? % dd if=/dev/null of=/var/lib/libvirt/images/foo bs=1 count=1 seek=10M % virsh define foo.xml (disk source file points to '/var/lib/libvirt/images/foo') % virsh vol-clone foo foo-clone default (the original guest name is 'foo') % virsh pool-refresh default % virsh vol-list default (make sure 'foo-clone' volume exists) % virsh define foo-clone.xml (disk source file points to '/var/lib/libvirt/images/foo-clone') % valgrind -v --leak-check=full virsh undefine foo-clone --remove-all-storage * Actual results: 1. virsh output Domain foo-clone has been undefined Volume '/var/lib/libvirt/images/foo-clone' removed. error: Failed to disconnect from the hypervisor, 1 leaked reference(s) 2. valgrind result ==6515== 92 (40 direct, 52 indirect) bytes in 1 blocks are definitely lost in loss record 46 of 69 ==6515== at 0x4A04A28: calloc (vg_replace_malloc.c:467) ==6515== by 0x4C89B71: virAlloc (memory.c:101) ==6515== by 0x4CFCACE: virGetStorageVol (datatypes.c:724) ==6515== by 0x4D4A8E0: remoteStorageVolLookupByPath (remote_driver.c:4664) ==6515== by 0x4D07153: virStorageVolLookupByPath (libvirt.c:12508) ==6515== by 0x4270E6: cmdUndefine (virsh.c:2828) ==6515== by 0x4151B6: vshCommandRun (virsh.c:17693) ==6515== by 0x4264D3: main (virsh.c:19270) ==6515== ==6515== LEAK SUMMARY: ==6515== definitely lost: 40 bytes in 1 blocks RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=786674 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index c8fd448..73c2192 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2787,10 +2787,6 @@ out: ctxt->node = vol_nodes[vol_i]; VIR_FREE(target); VIR_FREE(source); - if (vol) { - virStorageVolFree(vol); - vol = NULL; - } /* get volume source and target paths */ if (!(target = virXPathString("string(./target/@dev)", ctxt))) { @@ -2852,6 +2848,10 @@ out: vol_del_failed = true; } vshPrint(ctl, _("Volume '%s' removed.\n"), volume_tok?volume_tok:source); + + /* cleanup */ + virStorageVolFree(vol); + vol = NULL; } /* print volumes specified by user that were not found in domain definition */ -- 1.7.1

2 1

[libvirt] [PATCH] xen_xs: name xendConfigVersion magic numbers
by Philipp Hahn 02 Feb '12

02 Feb '12

libvirt supports 4 different versions of the user-land XenD daemon. When queried the daemon just returns its generation number, which is hard to match to the version of the Xen tools. Replace the magic generation numbers by named macro definitions to improve code readability. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- .../0013-improve-getting-xen-vcpu-counts.patch | 2 +- .../0014-improve-setting-xen-vcpu-counts.patch | 6 +- docs/api_extension/0015-remove-dead-xen-code.patch | 2 +- src/xen/xen_driver.c | 14 ++-- src/xen/xend_internal.c | 70 ++++++++++---------- src/xenxs/xen_sxpr.c | 24 ++++---- src/xenxs/xen_sxpr.h | 5 ++ src/xenxs/xen_xm.c | 14 ++-- src/xenxs/xenxs_private.h | 7 +- 9 files changed, 75 insertions(+), 69 deletions(-) diff --git a/docs/api_extension/0013-improve-getting-xen-vcpu-counts.patch b/docs/api_extension/0013-improve-getting-xen-vcpu-counts.patch index 047bc7b..c1aad03 100644 --- a/docs/api_extension/0013-improve-getting-xen-vcpu-counts.patch +++ b/docs/api_extension/0013-improve-getting-xen-vcpu-counts.patch @@ -100,7 +100,7 @@ index dfc6415..3642296 100644 + /* If xendConfigVersion is 2, then we can only report _LIVE (and + * xm_internal reports _CONFIG). If it is 3, then _LIVE and + * _CONFIG are always in sync for a running system. */ -+ if (domain->id < 0 && priv->xendConfigVersion < 3) ++ if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) + return -2; + if (domain->id < 0 && (flags & VIR_DOMAIN_VCPU_LIVE)) { + virXendError(VIR_ERR_OPERATION_INVALID, "%s", diff --git a/docs/api_extension/0014-improve-setting-xen-vcpu-counts.patch b/docs/api_extension/0014-improve-setting-xen-vcpu-counts.patch index 76dc948..3adbd75 100644 --- a/docs/api_extension/0014-improve-setting-xen-vcpu-counts.patch +++ b/docs/api_extension/0014-improve-setting-xen-vcpu-counts.patch @@ -110,7 +110,7 @@ index fe2ff86..66e8518 100644 + * depends on xendConfigVersion. */ + if (dom) { + priv = dom->conn->privateData; -+ if (priv->xendConfigVersion >= 3) ++ if (priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4) + flags |= VIR_DOMAIN_VCPU_CONFIG; + } + return xenUnifiedDomainSetVcpusFlags(dom, nvcpus, flags); @@ -163,14 +163,14 @@ index 3642296..55c2cc4 100644 + + priv = (xenUnifiedPrivatePtr) domain->conn->privateData; + -+ if ((domain->id < 0 && priv->xendConfigVersion < 3) || ++ if ((domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) || + (flags & VIR_DOMAIN_VCPU_MAXIMUM)) + return -2; + + /* With xendConfigVersion 2, only _LIVE is supported. With + * xendConfigVersion 3, only _LIVE|_CONFIG is supported for + * running domains, or _CONFIG for inactive domains. */ -+ if (priv->xendConfigVersion < 3) { ++ if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { + if (flags & VIR_DOMAIN_VCPU_CONFIG) { + virXendError(VIR_ERR_OPERATION_INVALID, "%s", + _("Xend version does not support modifying " diff --git a/docs/api_extension/0015-remove-dead-xen-code.patch b/docs/api_extension/0015-remove-dead-xen-code.patch index 56b99a3..64e0d98 100644 --- a/docs/api_extension/0015-remove-dead-xen-code.patch +++ b/docs/api_extension/0015-remove-dead-xen-code.patch @@ -122,7 +122,7 @@ index 55c2cc4..b90c331 100644 - - priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - -- if (domain->id < 0 && priv->xendConfigVersion < 3) +- if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) - return(-1); - - snprintf(buf, sizeof(buf), "%d", vcpus); diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 12d7eb0..94cafde 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -354,7 +354,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) /* XenD is active, so try the xm & xs drivers too, both requird to * succeed if root, optional otherwise */ - if (priv->xendConfigVersion <= 2) { + if (priv->xendConfigVersion <= XEND_CONFIG_VERSION_3_0_3) { VIR_DEBUG("Trying XM sub-driver"); if (xenXMOpen(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) { VIR_DEBUG("Activated XM sub-driver"); @@ -1161,7 +1161,7 @@ xenUnifiedDomainSetVcpus (virDomainPtr dom, unsigned int nvcpus) * depends on xendConfigVersion. */ if (dom) { priv = dom->conn->privateData; - if (priv->xendConfigVersion >= 3) + if (priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4) flags |= VIR_DOMAIN_VCPU_CONFIG; } return xenUnifiedDomainSetVcpusFlags(dom, nvcpus, flags); @@ -1239,7 +1239,7 @@ xenUnifiedDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { GET_PRIVATE(dom->conn); - if (dom->id == -1 && priv->xendConfigVersion < 3 ) { + if (dom->id == -1 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (priv->opened[XEN_UNIFIED_XM_OFFSET]) return xenXMDomainGetXMLDesc(dom, flags); } else { @@ -1561,7 +1561,7 @@ xenUnifiedDomainAttachDevice (virDomainPtr dom, const char *xml) * to make this API work */ if (priv->opened[XEN_UNIFIED_XEND_OFFSET] && - priv->xendConfigVersion >= 3) + priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4) flags |= VIR_DOMAIN_DEVICE_MODIFY_CONFIG; for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) @@ -1600,7 +1600,7 @@ xenUnifiedDomainDetachDevice (virDomainPtr dom, const char *xml) * to make this API work */ if (priv->opened[XEN_UNIFIED_XEND_OFFSET] && - priv->xendConfigVersion >= 3) + priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4) flags |= VIR_DOMAIN_DEVICE_MODIFY_CONFIG; for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) @@ -1642,7 +1642,7 @@ xenUnifiedDomainGetAutostart (virDomainPtr dom, int *autostart) { GET_PRIVATE(dom->conn); - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (priv->opened[XEN_UNIFIED_XM_OFFSET]) return xenXMDomainGetAutostart(dom, autostart); } else { @@ -1659,7 +1659,7 @@ xenUnifiedDomainSetAutostart (virDomainPtr dom, int autostart) { GET_PRIVATE(dom->conn); - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (priv->opened[XEN_UNIFIED_XM_OFFSET]) return xenXMDomainSetAutostart(dom, autostart); } else { diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index b754eca..5c3838f 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -954,7 +954,7 @@ xend_detect_config_version(virConnectPtr conn) { } else { /* Xen prior to 3.0.3 did not have the xend_config_format field, and is implicitly version 1. */ - priv->xendConfigVersion = 1; + priv->xendConfigVersion = XEND_CONFIG_VERSION_3_0_2; } sexpr_free(root); return (0); @@ -1224,7 +1224,7 @@ sexpr_to_domain(virConnectPtr conn, const struct sexpr *root) /* New 3.0.4 XenD will not report a domid for inactive domains, * so only error out for old XenD */ - if (!tmp && priv->xendConfigVersion < 3) + if (!tmp && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) goto error; if (tmp) @@ -1512,7 +1512,7 @@ xenDaemonDomainGetOSType(virDomainPtr domain) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(NULL); /* can we ask for a subset ? worth it ? */ @@ -1652,7 +1652,7 @@ xenDaemonDomainGetMaxMemory(virDomainPtr domain) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); /* can we ask for a subset ? worth it ? */ @@ -1691,7 +1691,7 @@ xenDaemonDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); snprintf(buf, sizeof(buf), "%lu", VIR_DIV_UP(memory, 1024)); @@ -1728,7 +1728,7 @@ xenDaemonDomainSetMemory(virDomainPtr domain, unsigned long memory) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); snprintf(buf, sizeof(buf), "%lu", VIR_DIV_UP(memory, 1024)); @@ -1808,7 +1808,7 @@ xenDaemonDomainGetXMLDesc(virDomainPtr domain, unsigned int flags, } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) { + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { /* fall-through to the next driver to handle */ return(NULL); } @@ -1852,7 +1852,7 @@ xenDaemonDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name); @@ -1887,7 +1887,7 @@ xenDaemonDomainGetState(virDomainPtr domain, virCheckFlags(0, -1); - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return -1; root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name); @@ -2186,14 +2186,14 @@ xenDaemonDomainSetVcpusFlags(virDomainPtr domain, unsigned int vcpus, priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if ((domain->id < 0 && priv->xendConfigVersion < 3) || + if ((domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) || (flags & VIR_DOMAIN_VCPU_MAXIMUM)) return -2; /* With xendConfigVersion 2, only _LIVE is supported. With * xendConfigVersion 3, only _LIVE|_CONFIG is supported for * running domains, or _CONFIG for inactive domains. */ - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (flags & VIR_DOMAIN_VCPU_CONFIG) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " @@ -2267,7 +2267,7 @@ xenDaemonDomainPinVcpu(virDomainPtr domain, unsigned int vcpu, } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { mapstr[0] = '['; mapstr[1] = 0; } else { @@ -2280,7 +2280,7 @@ xenDaemonDomainPinVcpu(virDomainPtr domain, unsigned int vcpu, snprintf(buf, sizeof(buf), "%d,", (8 * i) + j); strcat(mapstr, buf); } - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) mapstr[strlen(mapstr) - 1] = ']'; else mapstr[strlen(mapstr) - 1] = 0; @@ -2343,7 +2343,7 @@ xenDaemonDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) /* If xendConfigVersion is 2, then we can only report _LIVE (and * xm_internal reports _CONFIG). If it is 3, then _LIVE and * _CONFIG are always in sync for a running system. */ - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return -2; if (domain->id < 0 && (flags & VIR_DOMAIN_VCPU_LIVE)) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2477,7 +2477,7 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid) xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; /* Old approach for xen <= 3.0.3 */ - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { char **names, **tmp; unsigned char ident[VIR_UUID_BUFLEN]; names = xenDaemonListDomainsOld(conn); @@ -2648,7 +2648,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, return -1; } /* If xendConfigVersion < 3 only live config can be changed */ - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " "persistent config")); @@ -2656,7 +2656,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, } } else { /* Only live config can be changed if xendConfigVersion < 3 */ - if (priv->xendConfigVersion < 3 && + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4 && (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT && flags != VIR_DOMAIN_DEVICE_MODIFY_LIVE)) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2667,7 +2667,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, /* Xen only supports modifying both live and persistent config if * xendConfigVersion >= 3 */ - if (priv->xendConfigVersion >= 3 && + if (priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4 && (flags != (VIR_DOMAIN_DEVICE_MODIFY_LIVE | VIR_DOMAIN_DEVICE_MODIFY_CONFIG))) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2816,7 +2816,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, return -1; } /* If xendConfigVersion < 3 only live config can be changed */ - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " "persistent config")); @@ -2824,7 +2824,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, } } else { /* Only live config can be changed if xendConfigVersion < 3 */ - if (priv->xendConfigVersion < 3 && + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4 && (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT && flags != VIR_DOMAIN_DEVICE_MODIFY_LIVE)) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2835,7 +2835,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml, /* Xen only supports modifying both live and persistent config if * xendConfigVersion >= 3 */ - if (priv->xendConfigVersion >= 3 && + if (priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4 && (flags != (VIR_DOMAIN_DEVICE_MODIFY_LIVE | VIR_DOMAIN_DEVICE_MODIFY_CONFIG))) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2929,7 +2929,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml, return -1; } /* If xendConfigVersion < 3 only live config can be changed */ - if (priv->xendConfigVersion < 3) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("Xend version does not support modifying " "persistent config")); @@ -2937,7 +2937,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml, } } else { /* Only live config can be changed if xendConfigVersion < 3 */ - if (priv->xendConfigVersion < 3 && + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4 && (flags != VIR_DOMAIN_DEVICE_MODIFY_CURRENT && flags != VIR_DOMAIN_DEVICE_MODIFY_LIVE)) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2948,7 +2948,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml, /* Xen only supports modifying both live and persistent config if * xendConfigVersion >= 3 */ - if (priv->xendConfigVersion >= 3 && + if (priv->xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4 && (flags != (VIR_DOMAIN_DEVICE_MODIFY_LIVE | VIR_DOMAIN_DEVICE_MODIFY_CONFIG))) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", @@ -3016,7 +3016,7 @@ xenDaemonDomainGetAutostart(virDomainPtr domain, * config files used by old Xen) will handle this. */ priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name); @@ -3056,7 +3056,7 @@ xenDaemonDomainSetAutostart(virDomainPtr domain, * config files used by old Xen) will handle this. */ priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); root = sexpr_get(domain->conn, "/xend/domain/%s?detail=1", domain->name); @@ -3318,7 +3318,7 @@ virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) { priv = (xenUnifiedPrivatePtr) conn->privateData; - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(NULL); if (!(def = virDomainDefParseString(priv->caps, xmlDesc, @@ -3367,7 +3367,7 @@ int xenDaemonDomainCreate(virDomainPtr domain) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); ret = xend_op(domain->conn, domain->name, "op", "start", NULL); @@ -3394,7 +3394,7 @@ int xenDaemonDomainUndefine(virDomainPtr domain) priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); return xend_op(domain->conn, domain->name, "op", "delete", NULL); @@ -3419,7 +3419,7 @@ xenDaemonNumOfDefinedDomains(virConnectPtr conn) /* xm_internal.c (the support for defined domains from /etc/xen * config files used by old Xen) will handle this. */ - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); root = sexpr_get(conn, "/xend/domain?state=halted"); @@ -3447,7 +3447,7 @@ xenDaemonListDefinedDomains(virConnectPtr conn, char **const names, int maxnames struct sexpr *_for_i, *node; xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; - if (priv->xendConfigVersion < 3) + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return(-1); if ((names == NULL) || (maxnames < 0)) @@ -3513,7 +3513,7 @@ xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams) /* Support only xendConfigVersion >=4 */ priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 4) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("unsupported in xendConfigVersion < 4")); return NULL; @@ -3586,7 +3586,7 @@ xenDaemonGetSchedulerParameters(virDomainPtr domain, /* Support only xendConfigVersion >=4 */ priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 4) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("unsupported in xendConfigVersion < 4")); return (-1); @@ -3694,7 +3694,7 @@ xenDaemonSetSchedulerParameters(virDomainPtr domain, /* Support only xendConfigVersion >=4 and active domains */ priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (priv->xendConfigVersion < 4) { + if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_1_0) { virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("unsupported in xendConfigVersion < 4")); return (-1); @@ -3802,7 +3802,7 @@ xenDaemonDomainBlockPeek (virDomainPtr domain, const char *path, priv = (xenUnifiedPrivatePtr) domain->conn->privateData; - if (domain->id < 0 && priv->xendConfigVersion < 3) + if (domain->id < 0 && priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) return -2; /* Decline, allow XM to handle it. */ /* Security check: The path must correspond to a block device. */ diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 8c04596..756eb77 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -55,7 +55,7 @@ int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion) { int id = -1; const char * tmp = sexpr_node(root, "domain/domid"); - if (tmp == NULL && xendConfigVersion < 3) { /* Old XenD, domid was mandatory */ + if (tmp == NULL && xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { /* domid was mandatory */ XENXS_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing id")); } else { @@ -468,7 +468,7 @@ xenParseSxprDisks(virDomainDefPtr def, disk->device = VIR_DOMAIN_DISK_DEVICE_DISK; /* New style disk config from Xen >= 3.0.3 */ - if (xendConfigVersion > 1) { + if (xendConfigVersion >= XEND_CONFIG_VERSION_3_0_3) { offset = strrchr(dst, ':'); if (offset) { if (STREQ (offset, ":cdrom")) { @@ -814,7 +814,7 @@ xenParseSxprGraphicsOld(virDomainDefPtr def, * present yet. Subsquent dumps of the XML will eventually * find the port in XenStore once VNC server has started */ - if (port == -1 && xendConfigVersion < 2) + if (port == -1 && xendConfigVersion < XEND_CONFIG_VERSION_3_0_3) port = 5900 + def->id; if ((unused && STREQ(unused, "1")) || port == -1) @@ -1132,7 +1132,7 @@ xenParseSxpr(const struct sexpr *root, goto no_memory; tmp = sexpr_node(root, "domain/domid"); - if (tmp == NULL && xendConfigVersion < 3) { /* Old XenD, domid was mandatory */ + if (tmp == NULL && xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { /* domid was mandatory */ XENXS_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("domain information incomplete, missing id")); goto error; @@ -1318,7 +1318,7 @@ xenParseSxpr(const struct sexpr *root, /* Old style cdrom config from Xen <= 3.0.2 */ if (hvm && - xendConfigVersion == 1) { + xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) { tmp = sexpr_node(root, "domain/image/hvm/cdrom"); if ((tmp != NULL) && (tmp[0] != 0)) { virDomainDiskDefPtr disk; @@ -1617,7 +1617,7 @@ xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, virBufferAsprintf(buf, "(xauthority '%s')", def->data.sdl.xauth); } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { virBufferAddLit(buf, "(vnc 1)"); - if (xendConfigVersion >= 2) { + if (xendConfigVersion >= XEND_CONFIG_VERSION_3_0_3) { if (def->data.vnc.autoport) { virBufferAddLit(buf, "(vncunused 1)"); } else { @@ -1762,7 +1762,7 @@ xenFormatSxprDisk(virDomainDiskDefPtr def, /* Xend <= 3.0.2 doesn't include cdrom config here */ if (hvm && def->device == VIR_DOMAIN_DISK_DEVICE_CDROM && - xendConfigVersion == 1) { + xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) { if (isAttach) { XENXS_ERROR(VIR_ERR_INVALID_ARG, _("Cannot directly attach CDROM %s"), def->src); @@ -1787,7 +1787,7 @@ xenFormatSxprDisk(virDomainDiskDefPtr def, if (hvm) { /* Xend <= 3.0.2 wants a ioemu: prefix on devices for HVM */ - if (xendConfigVersion == 1) { + if (xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) { virBufferEscapeSexpr(buf, "(dev 'ioemu:%s')", def->dst); } else { /* But newer does not */ @@ -2338,7 +2338,7 @@ xenFormatSxpr(virConnectPtr conn, switch (def->disks[i]->device) { case VIR_DOMAIN_DISK_DEVICE_CDROM: /* Only xend <= 3.0.2 wants cdrom config here */ - if (xendConfigVersion != 1) + if (xendConfigVersion != XEND_CONFIG_VERSION_3_0_2) break; if (!STREQ(def->disks[i]->dst, "hdc") || def->disks[i]->src == NULL) @@ -2437,7 +2437,7 @@ xenFormatSxpr(virConnectPtr conn, } /* get the device emulation model */ - if (def->emulator && (hvm || xendConfigVersion >= 3)) + if (def->emulator && (hvm || xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4)) virBufferEscapeSexpr(&buf, "(device_model '%s')", def->emulator); /* look for HPET in order to override the hypervisor/xend default */ @@ -2452,7 +2452,7 @@ xenFormatSxpr(virConnectPtr conn, /* PV graphics for xen <= 3.0.4, or HVM graphics for xen <= 3.1.0 */ if ((!hvm && xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF) || - (hvm && xendConfigVersion < 4)) { + (hvm && xendConfigVersion < XEND_CONFIG_VERSION_3_1_0)) { if ((def->ngraphics == 1) && xenFormatSxprGraphicsOld(def->graphics[0], &buf, xendConfigVersion) < 0) @@ -2484,7 +2484,7 @@ xenFormatSxpr(virConnectPtr conn, /* New style PV graphics config xen >= 3.0.4, * or HVM graphics config xen >= 3.0.5 */ if ((xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF && !hvm) || - (xendConfigVersion >= 4 && hvm)) { + (xendConfigVersion >= XEND_CONFIG_VERSION_3_1_0 && hvm)) { if ((def->ngraphics == 1) && xenFormatSxprGraphicsNew(def->graphics[0], &buf) < 0) goto error; diff --git a/src/xenxs/xen_sxpr.h b/src/xenxs/xen_sxpr.h index a66c60a..4f96d2b 100644 --- a/src/xenxs/xen_sxpr.h +++ b/src/xenxs/xen_sxpr.h @@ -32,6 +32,11 @@ # include "domain_conf.h" # include "sexpr.h" +#define XEND_CONFIG_VERSION_3_0_2 1 +#define XEND_CONFIG_VERSION_3_0_3 2 +#define XEND_CONFIG_VERSION_3_0_4 3 +#define XEND_CONFIG_VERSION_3_1_0 4 + /* helper functions to get the dom id from a sexpr */ int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion); int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion); diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index a0d4806..e580a3e 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -570,7 +570,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, } } - if (hvm && xendConfigVersion == 1) { + if (hvm && xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) { if (xenXMConfigGetString(conf, "cdrom", &str, NULL) < 0) goto cleanup; if (str) { @@ -858,7 +858,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, } /* HVM guests, or old PV guests use this config format */ - if (hvm || xendConfigVersion < 3) { + if (hvm || xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) { if (xenXMConfigGetBool(conf, "vnc", &val, 0) < 0) goto cleanup; @@ -1169,7 +1169,7 @@ static int xenFormatXMDisk(virConfValuePtr list, virBufferAdd(&buf, disk->src, -1); } virBufferAddLit(&buf, ","); - if (hvm && xendConfigVersion == 1) + if (hvm && xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) virBufferAddLit(&buf, "ioemu:"); virBufferAdd(&buf, disk->dst, -1); @@ -1545,7 +1545,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, (1 << VIR_DOMAIN_FEATURE_APIC)) ? 1 : 0) < 0) goto no_memory; - if (xendConfigVersion >= 3) { + if (xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4) { if (xenXMConfigSetInt(conf, "hap", (def->features & (1 << VIR_DOMAIN_FEATURE_HAP)) ? 1 : 0) < 0) @@ -1584,7 +1584,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, break; } - if (xendConfigVersion == 1) { + if (xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) { for (i = 0 ; i < def->ndisks ; i++) { if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM && def->disks[i]->dst && @@ -1665,7 +1665,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, } if (def->ngraphics == 1) { - if (xendConfigVersion < (hvm ? 4 : XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) { + if (xendConfigVersion < (hvm ? XEND_CONFIG_VERSION_3_1_0 : XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) { if (def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { if (xenXMConfigSetInt(conf, "sdl", 1) < 0) goto no_memory; @@ -1772,7 +1772,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, diskVal->list = NULL; for (i = 0 ; i < def->ndisks ; i++) { - if (xendConfigVersion == 1 && + if (xendConfigVersion == XEND_CONFIG_VERSION_3_0_2 && def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM && def->disks[i]->dst && STREQ(def->disks[i]->dst, "hdc")) { diff --git a/src/xenxs/xenxs_private.h b/src/xenxs/xenxs_private.h index 60d27d2..bc903f5 100644 --- a/src/xenxs/xenxs_private.h +++ b/src/xenxs/xenxs_private.h @@ -29,6 +29,7 @@ # include <stdint.h> # include <xen/xen.h> +# include "xen_sxpr.h" /* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public * headers. Its semantic was retained with XEN_LEGACY_MAX_VCPUS. @@ -40,10 +41,10 @@ # ifdef WITH_RHEL5_API # define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0 -# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2 +# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF XEND_CONFIG_VERSION_3_0_3 # else -# define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3 -# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3 +# define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU XEND_CONFIG_VERSION_3_0_4 +# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF XEND_CONFIG_VERSION_3_0_4 # endif # define MIN_XEN_GUEST_SIZE 64 /* 64 megabytes */ -- 1.7.1

2 2

[libvirt] Linker error while compiling latest libvirt git source
by Deepak C Shetty 02 Feb '12

02 Feb '12

make all-am make[3]: Entering directory `/home/dpkshetty/work/libvirt/libvirt/daemon' GEN qemu_dispatch.h GEN remote_dispatch.h CC libvirtd-remote_protocol.o CC libvirtd-qemu_protocol.o CC libvirtd-remote.o CC libvirtd-libvirtd.o CC libvirtd-stream.o In file included from remote.c:107:0: remote_dispatch.h: In function 'remoteDispatchDomainGetDiskErrorsHelper': remote.c:3611:9: warning: 'len' may be used uninitialized in this function [-Wuninitialized] At top level: cc1: warning: unrecognized command line option "-Wno-suggest-attribute=const" cc1: warning: unrecognized command line option "-Wno-suggest-attribute=pure" CCLD libvirtd libtool: link: warning: library `/usr/lib/i386-linux-gnu/libgcrypt.la' was moved. libtool: link: warning: library `/usr/lib/i386-linux-gnu/libgcrypt.la' was moved. ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_process.o): In function `qemuProcessStart': /home/dpkshetty/work/libvirt/libvirt/src/qemu/qemu_process.c:3343: undefined reference to `virCommandAllowCap' ../src/.libs/libvirt_driver_storage.a(libvirt_driver_storage_la-storage_backend_fs.o): In function `virStorageBackendFileSystemVolResize': /home/dpkshetty/work/libvirt/libvirt/src/storage/storage_backend_fs.c:1234: undefined reference to `virStorageFileResize' collect2: ld returned 1 exit status make[3]: *** [libvirtd] Error 1 make[3]: Leaving directory `/home/dpkshetty/work/libvirt/libvirt/daemon' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/dpkshetty/work/libvirt/libvirt/daemon' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/dpkshetty/work/libvirt/libvirt' make: *** [all] Error 2

2 5