- Devel - libvirt List Archives

[libvirt] [PATCH] libxl: eliminate memory leak in libxmlDomainModifyDeviceFlags
by Laine Stump 28 Feb '12

28 Feb '12

I found this randomly by examination when a tag search led me to this file. I don't have a setup to test it, but it appears fairly obvious that this call to virDomainDeviceDefParse is both unnecessary (since it will again be called at the top of the immediately following if(), and if not there, then at the top of the if following that), but it also creates a leak of one virDomainDeviceDef and one [whatever type of device the DeviceDef is pointing to; probably a virDomainDiskDef] in the case that the function has been called with VIR_DOMAIN_DEVICE_MODIFY_CONFIG (the second parse will overwrite the devicedef that was just created). --- src/libxl/libxl_driver.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6db33c2..d5fa64a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3243,10 +3243,6 @@ libxlDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, goto cleanup; } - if (!(dev = virDomainDeviceDefParse(driver->caps, vm->def, xml, - VIR_DOMAIN_XML_INACTIVE))) - goto cleanup; - priv = vm->privateData; if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { -- 1.7.7.6

2 2

[libvirt] Does libvirt support spice agent-mouse?
by Zhou Peng 28 Feb '12

28 Feb '12

Hi all, How to set the qemu-kvm argv agent-mouse=on/off option in libvirt xml file pls? I googled but failed. Thanks, -- Zhou Peng

2 1

[libvirt] [PATCH] virsh: Break long lines in virsh.pod
by Osier Yang 27 Feb '12

27 Feb '12

No content changes, just breaking long lines. Pushed under trivial rule. --- tools/virsh.pod | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index aa4c560..c306a38 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -468,7 +468,8 @@ Flags I<--live> or I<--config> select whether this command works on live 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. +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. @@ -1471,7 +1472,8 @@ address. [I<--persistent>] [I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] Attach a new network interface to the domain. -I<type> can be either I<network> to indicate a physical network device or I<bridge> to indicate a bridge to a device. +I<type> can be either I<network> to indicate a physical network device or +I<bridge> to indicate a bridge to a device. I<source> indicates the source device. I<target> allows to indicate the target device in the guest. I<mac> allows to specify the MAC address of the network interface. @@ -1502,9 +1504,10 @@ from the domain. =item B<detach-interface> I<domain-id> I<type> [I<--mac mac>] Detach a network interface from a domain. -I<type> can be either I<network> to indicate a physical network device or I<bridge> to indicate a bridge to a device. -It is recommended to use the I<mac> option to distinguish between the interfaces -if more than one are present on the domain. +I<type> can be either I<network> to indicate a physical network device or +I<bridge> to indicate a bridge to a device. It is recommended to use the +I<mac> option to distinguish between the interfaces if more than one are +present on the domain. =item B<update-device> I<domain-id> I<file> [I<--persistent>] [I<--force>] -- 1.7.7.3

1 0

[libvirt] [PATCH 0/3 v4] New command for changing media
by Osier Yang 27 Feb '12

27 Feb '12

[PATCH 0/3] introduces two new helper functions: vshFindDisk is to find the disk XML node in xml doc with the type (indicates it's normal disk or changeable disk). VshPrepareDiskXML is to prepare the disk XML for disk changing commands' use, such as detach-disk. The purpose of this patch is to prepare for upcoming new command "change-disk", which will use the two helper functions too. Please see [PATCH 3/3] for a overall description of the new command. v2 - v3 * Update vshFindDisk to support search the disk node with both the source path and target name. * Change names of the two new enums ([PATCH 1/3]). * Use virXMLParseStringCtxt instead of xmlReadDoc * Use VIR_ALLOC_N instead of vshCalloc. * [PATCH 3/4] and [PATCH 4/4] are merged into [PATCH 3/3] * Change option "--target" into "--path". * Defaults to use "--update" if none of "--eject", "--insert", and "--update" is specified. * Update docs to be consistent with the changes on codes. * Other nits. v3 - v4: * No changes. Osier Yang (3) virsh: Two new helper functions for disk device changes virsh: Use vshFindDisk and vshPrepareDiskXML in virsh: New command cmdChangeMedia tools/virsh.c | 418 ++++++++++++++++++++++++++++++++++++++++++++++++------- tools/virsh.pod | 33 ++++- 2 files changed, 395 insertions(+), 56 deletions(-) Regards, Osier

2 7

[libvirt] [PATCH 0/7 v2] virtio-scsi: New device address logic for SCSI devices
by Osier Yang 27 Feb '12

27 Feb '12

This patch series completed the support for the first 3 parts of Paolo's proposal: http://permalink.gmane.org/gmane.comp.emulators.libvirt/50428 The 3 parts are: * SCSI controller models * Stable addressing for SCSI devices * LUN passthrough: block devices [PATCH 1/10] and [PATCH 2/10] add two new "scsi" controllers, "ibmvscsi" and "virtio-scsi". [PATCH 3/10] adds a helper functions to get a disk controller's model. [PATCH 4/10] introduces attribute "target" for device addressing XML. Updates lots of tests to be consistent with the newly introduced attribute. [PATCH 6/10] builds the qemu command line for the new addressing format. The logic is: 1) If the disk controller model is "lsilogic": -drive file=/dev/sda,if=none,id=drive-scsi0-0-3,\ format=raw -device scsi-disk,bus=scsi0.0,\ scsi-id=0,drive=drive-scsi0-0-3-0,id=scsi0-0-3-0 libvirt attrs --> qdev properties: bus=scsi<controller>.0 scsi-id=<unit> 2) If the disk controller model is other else: The command line will be like: -drive file=/dev/sda,if=none,id=drive-scsi0-0-3-0,\ format=raw -device scsi-disk,bus=scsi0.0,channel=0,\ scsi-id=3,lun=0,drive=drive-scsi0-0-3-0,id=scsi0-0-3-0 libvirt attrs --> qdev properties: bus=scsi<controller>.0 channel=<bus> scsi-id=<target> lun=<unit> Paolo Bonzini (2) qemu: add ibmvscsi controller model qemu: add virtio-scsi controller model Osier Yang (5) conf: Add helper function to look up disk controller conf: Introduce new attribute for device address format qemu: New cap flag to indicate if channel is supported qemu: Build command line for the new address format tests: Add tests for virtio-scsi and ibmvscsi v1 ~ v2: * [PATCH 3/10] is removed * "target" will be formated to all bus type, once it's device address is of type "drive". * Error if "target != 0" and the disk bus is not SCSI or the scsi controller model is "lsilogic". * [PATCH 9/10] and [PATCH 8/10] are meged into [PATCH 4/7] docs/formatdomain.html.in | 16 ++- docs/schemas/domaincommon.rng | 12 ++ src/conf/domain_conf.c | 38 ++++- src/conf/domain_conf.h | 6 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 156 +++++++++++++++++--- src/qemu/qemu_command.h | 7 +- src/qemu/qemu_hotplug.c | 12 +- src/vmx/vmx.c | 4 +- tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 12 +- tests/domainsnapshotxml2xmlout/full_domain.xml | 2 +- tests/domainsnapshotxml2xmlout/metadata.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-bios.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 4 +- .../qemuxml2argv-blkiotune-device.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 2 +- .../qemuxml2argv-boot-complex-bootindex.xml | 10 +- .../qemuxml2argvdata/qemuxml2argv-boot-complex.xml | 10 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 4 +- ...uxml2argv-boot-menu-disable-drive-bootindex.xml | 2 +- .../qemuxml2argv-boot-menu-disable-drive.xml | 2 +- .../qemuxml2argv-boot-menu-disable.xml | 2 +- .../qemuxml2argv-boot-menu-enable.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-network.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml | 2 +- .../qemuxml2argv-channel-guestfwd.xml | 2 +- .../qemuxml2argv-channel-spicevmc-old.xml | 2 +- .../qemuxml2argv-channel-spicevmc.xml | 2 +- .../qemuxml2argv-channel-virtio-auto.xml | 2 +- .../qemuxml2argv-channel-virtio.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-clock-france.xml | 2 +- .../qemuxml2argv-clock-localtime.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 2 +- .../qemuxml2argv-clock-variable.xml | 2 +- .../qemuxml2argv-console-compat-auto.xml | 2 +- .../qemuxml2argv-console-compat-chardev.xml | 2 +- .../qemuxml2argv-console-compat.xml | 2 +- .../qemuxml2argv-console-virtio-many.xml | 2 +- .../qemuxml2argv-console-virtio.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml | 4 +- .../qemuxml2argv-disk-cdrom-empty.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 4 +- .../qemuxml2argv-disk-copy_on_read.xml | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.xml | 4 +- .../qemuxml2argv-disk-drive-boot-disk.xml | 4 +- .../qemuxml2argv-disk-drive-cache-directsync.xml | 4 +- .../qemuxml2argv-disk-drive-cache-unsafe.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v1-none.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v1-wb.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v1-wt.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v2-none.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v2-wb.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v2-wt.xml | 4 +- ...muxml2argv-disk-drive-error-policy-enospace.xml | 4 +- .../qemuxml2argv-disk-drive-error-policy-stop.xml | 4 +- ...rgv-disk-drive-error-policy-wreport-rignore.xml | 4 +- .../qemuxml2argv-disk-drive-fat.xml | 2 +- .../qemuxml2argv-disk-drive-fmt-qcow.xml | 4 +- .../qemuxml2argv-disk-drive-network-nbd.xml | 2 +- .../qemuxml2argv-disk-drive-network-rbd-auth.xml | 2 +- ...emuxml2argv-disk-drive-network-rbd-ceph-env.xml | 2 +- .../qemuxml2argv-disk-drive-network-rbd.xml | 2 +- .../qemuxml2argv-disk-drive-network-sheepdog.xml | 2 +- .../qemuxml2argv-disk-drive-no-boot.xml | 6 +- .../qemuxml2argv-disk-drive-readonly-disk.xml | 4 +- .../qemuxml2argv-disk-drive-readonly-no-device.xml | 4 +- .../qemuxml2argv-disk-drive-shared.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 6 +- .../qemuxml2argv-disk-ioeventfd.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 8 +- .../qemuxml2argv-disk-sata-device.xml | 2 +- .../qemuxml2argv-disk-scsi-device.xml | 6 +- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 9 + .../qemuxml2argv-disk-scsi-virtio-scsi.xml | 32 ++++ .../qemuxml2argv-disk-scsi-vscsi.args | 8 + .../qemuxml2argv-disk-scsi-vscsi.xml | 32 ++++ .../qemuxml2argv-disk-snapshot.xml | 6 +- .../qemuxml2argv-disk-transient.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 2 +- .../qemuxml2argv-floppy-drive-fat.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml | 2 +- .../qemuxml2argv-graphics-listen-network.xml | 2 +- .../qemuxml2argv-graphics-listen-network2.xml | 2 +- .../qemuxml2argv-graphics-sdl-fullscreen.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 +- .../qemuxml2argv-graphics-spice-compression.xml | 2 +- .../qemuxml2argv-graphics-spice-qxl-vga.xml | 2 +- .../qemuxml2argv-graphics-spice-timeout.xml | 2 +- .../qemuxml2argv-graphics-spice.xml | 2 +- .../qemuxml2argv-graphics-vnc-sasl.xml | 2 +- .../qemuxml2argv-graphics-vnc-socket.xml | 2 +- .../qemuxml2argv-graphics-vnc-tls.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +- .../qemuxml2argv-hostdev-pci-address.xml | 2 +- .../qemuxml2argv-hostdev-usb-address.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml | 2 +- .../qemuxml2argv-input-usbmouse-addr.xml | 2 +- .../qemuxml2argv-input-usbmouse.xml | 2 +- .../qemuxml2argv-input-usbtablet.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-lease.xml | 4 +- .../qemuxml2argv-machine-aliases1.xml | 2 +- .../qemuxml2argv-machine-aliases2.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-metadata.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 2 +- .../qemuxml2argv-misc-no-reboot.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 2 +- .../qemuxml2argv-multifunction-pci-device.xml | 2 +- .../qemuxml2argv-net-bandwidth.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-client.xml | 2 +- .../qemuxml2argv-net-eth-ifname.xml | 2 +- .../qemuxml2argv-net-eth-names.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-server.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 2 +- .../qemuxml2argv-net-virtio-device.xml | 2 +- .../qemuxml2argv-net-virtio-network-portgroup.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 2 +- .../qemuxml2argv-nographics-vga.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-nographics.xml | 2 +- .../qemuxml2argv-numatune-memory.xml | 2 +- .../qemuxml2argv-parallel-tcp-chardev.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 13 ++- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 13 ++- .../qemuxml2argv-qemu-ns-no-env.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml | 2 +- .../qemuxml2argv-restore-v2-fd.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 2 +- .../qemuxml2argv-seclabel-dynamic-baselabel.xml | 2 +- .../qemuxml2argv-seclabel-dynamic-override.xml | 4 +- .../qemuxml2argv-seclabel-dynamic.xml | 2 +- .../qemuxml2argv-seclabel-none.xml | 2 +- .../qemuxml2argv-seclabel-static-relabel.xml | 2 +- .../qemuxml2argv-seclabel-static.xml | 2 +- .../qemuxml2argv-serial-dev-chardev.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 2 +- .../qemuxml2argv-serial-file-chardev.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.xml | 2 +- .../qemuxml2argv-serial-many-chardev.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.xml | 2 +- .../qemuxml2argv-serial-pty-chardev.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 2 +- .../qemuxml2argv-serial-target-port-auto.xml | 2 +- .../qemuxml2argv-serial-tcp-chardev.xml | 2 +- .../qemuxml2argv-serial-tcp-telnet-chardev.xml | 2 +- .../qemuxml2argv-serial-tcp-telnet.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 2 +- .../qemuxml2argv-serial-udp-chardev.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 2 +- .../qemuxml2argv-serial-unix-chardev.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 2 +- .../qemuxml2argv-serial-vc-chardev.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 2 +- tests/qemuxml2argvtest.c | 4 + .../qemuxml2xmlout-balloon-device-auto.xml | 2 +- .../qemuxml2xmlout-channel-virtio-auto.xml | 2 +- .../qemuxml2xmlout-console-compat-auto.xml | 2 +- .../qemuxml2xmlout-console-virtio.xml | 2 +- .../qemuxml2xmlout-disk-cdrom-empty.xml | 4 +- .../qemuxml2xmlout-disk-scsi-device-auto.xml | 4 +- .../qemuxml2xmlout-graphics-listen-network2.xml | 2 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 2 +- .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 2 +- .../qemuxml2xmlout-serial-target-port-auto.xml | 2 +- tests/qemuxml2xmltest.c | 4 +- tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml | 12 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml | 6 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml | 4 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml | 4 +- tests/vmx2xmldata/vmx2xml-floppy-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-floppy-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml | 2 +- tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-scsi-driver.xml | 8 +- tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml | 2 +- tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml | 4 +- tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml | 4 +- 209 files changed, 588 insertions(+), 300 deletions(-) Regards, Osier

3 15

[libvirt] [PATCH] qemu: unescape HMP commands before converting them to json
by Josh Durgin 27 Feb '12

27 Feb '12

QMP commands don't need to be escaped since converting them to json also escapes special characters. When a QMP command fails, however, libvirt falls back to HMP commands. These fallback functions (qemuMonitorText*) do their own escaping, and pass the result directly to qemuMonitorHMPCommandWithFd. If the monitor is in json mode, these pre-escaped commands will be escaped again when converted to json, which can result in the wrong arguments being sent. For example, a filename test\file would be sent in json as test\\file. This prevented attaching an image file with a " or \ in its name in qemu 1.0.50, and also broke rbd attachment (which uses backslashes to escape some internal arguments.) Reported-by: Masuko Tomoya <tomoya.masuko(a)gmail.com> Signed-off-by: Josh Durgin <josh.durgin(a)dreamhost.com> --- .gitignore | 1 + src/qemu/qemu_monitor.c | 59 +++++++++++++++++++++++- src/qemu/qemu_monitor.h | 1 + tests/Makefile.am | 12 ++++- tests/qemumonitortest.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 181 insertions(+), 6 deletions(-) create mode 100644 tests/qemumonitortest.c diff --git a/.gitignore b/.gitignore index b7561dc..264a419 100644 --- a/.gitignore +++ b/.gitignore @@ -128,6 +128,7 @@ /tests/openvzutilstest /tests/qemuargv2xmltest /tests/qemuhelptest +/tests/qemumonitortest /tests/qemuxmlnstest /tests/qparamtest /tests/reconnect diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 93f3505..85212a7 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -153,6 +153,49 @@ char *qemuMonitorEscapeArg(const char *in) return out; } +char *qemuMonitorUnescapeArg(const char *in) +{ + int i, j; + char *out; + int len = strlen(in) + 1; + char next; + + if (VIR_ALLOC_N(out, len) < 0) + return NULL; + + for (i = j = 0; i < len; ++i) { + next = in[i]; + if (in[i] == '\\') { + if (len < i + 1) { + // trailing backslash shouldn't be possible + VIR_FREE(out); + return NULL; + } + ++i; + switch(in[i]) { + case 'r': + next = '\r'; + break; + case 'n': + next = '\n'; + break; + case '"': + case '\\': + next = in[i]; + break; + default: + // invalid input + VIR_FREE(out); + return NULL; + } + } + out[j++] = next; + } + out[j] = '\0'; + + return out; +} + #if DEBUG_RAW_IO # include <c-ctype.h> static char * qemuMonitorEscapeNonPrintable(const char *text) @@ -852,10 +895,20 @@ int qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon, int scm_fd, char **reply) { - if (mon->json) - return qemuMonitorJSONHumanCommandWithFd(mon, cmd, scm_fd, reply); - else + char *json_cmd = NULL; + if (mon->json) { + // hack to avoid complicating each call to text monitor functions + json_cmd = qemuMonitorUnescapeArg(cmd); + if (!json_cmd) { + VIR_DEBUG("Could not unescape command: %s", cmd); + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to unescape command")); + return -1; + } + return qemuMonitorJSONHumanCommandWithFd(mon, json_cmd, scm_fd, reply); + } else { return qemuMonitorTextCommandWithFd(mon, cmd, scm_fd, reply); + } } /* Ensure proper locking around callbacks. */ diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 7c6c52b..9768457 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -128,6 +128,7 @@ struct _qemuMonitorCallbacks { char *qemuMonitorEscapeArg(const char *in); +char *qemuMonitorUnescapeArg(const char *in); qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm, virDomainChrSourceDefPtr config, diff --git a/tests/Makefile.am b/tests/Makefile.am index 9974c2f..3e505a5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -72,6 +72,7 @@ EXTRA_DIST = \ nwfilterxml2xmlout \ oomtrace.pl \ qemuhelpdata \ + qemumonitortest \ qemuxml2argvdata \ qemuxml2xmloutdata \ qemuxmlnsdata \ @@ -110,7 +111,8 @@ check_PROGRAMS += xml2sexprtest sexpr2xmltest \ endif if WITH_QEMU check_PROGRAMS += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest \ - qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest + qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest \ + qemumonitortest endif if WITH_OPENVZ @@ -237,7 +239,8 @@ endif if WITH_QEMU TESTS += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest qemuargv2xmltest \ - qemuhelptest domainsnapshotxml2xmltest nwfilterxml2xmltest + qemuhelptest domainsnapshotxml2xmltest nwfilterxml2xmltest \ + qemumonitortest endif if WITH_OPENVZ @@ -365,6 +368,9 @@ qemuargv2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) qemuhelptest_SOURCES = qemuhelptest.c testutils.c testutils.h qemuhelptest_LDADD = $(qemu_LDADDS) $(LDADDS) +qemumonitortest_SOURCES = qemumonitortest.c testutils.c testutils.h +qemumonitortest_LDADD = $(qemu_LDADDS) $(LDADDS) + domainsnapshotxml2xmltest_SOURCES = \ domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h @@ -372,7 +378,7 @@ domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) else EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ qemuxmlnstest.c qemuhelptest.c domainsnapshotxml2xmltest.c \ - testutilsqemu.c testutilsqemu.h + qemumonitortest.c testutilsqemu.c testutilsqemu.h endif if WITH_OPENVZ diff --git a/tests/qemumonitortest.c b/tests/qemumonitortest.c new file mode 100644 index 0000000..bf90502 --- /dev/null +++ b/tests/qemumonitortest.c @@ -0,0 +1,114 @@ +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#ifdef WITH_QEMU + +# include "internal.h" +# include "memory.h" +# include "testutils.h" +# include "util.h" +# include "qemu/qemu_monitor.h" + +struct testEscapeString +{ + const char* unescaped; + const char* escaped; +}; + +static struct testEscapeString escapeStrings[] = { + { "", "" }, + { " ", " " }, + { "\\", "\\\\" }, + { "\n", "\\n" }, + { "\r", "\\r" }, + { "\"", "\\\"" }, + { "\"\"\"\\\\\n\r\\\\\n\r\"\"\"", "\\\"\\\"\\\"\\\\\\\\\\n\\r\\\\\\\\\\n\\r\\\"\\\"\\\"" }, + { "drive_add dummy file=foo\\", "drive_add dummy file=foo\\\\" }, + { "block info", "block info" }, + { "set_password \":\\\"\"", "set_password \\\":\\\\\\\"\\\"" }, +}; + +static int testEscapeArg(const void *data ATTRIBUTE_UNUSED) +{ + int i; + char *escaped = NULL; + for (i = 0; i < ARRAY_CARDINALITY(escapeStrings); ++i) { + escaped = qemuMonitorEscapeArg(escapeStrings[i].unescaped); + if (!escaped) { + if (virTestGetDebug() > 0) { + fprintf(stderr, "\nUnescaped string [%s]\n", escapeStrings[i].unescaped); + fprintf(stderr, "Expect result [%s]\n", escapeStrings[i].escaped); + fprintf(stderr, "Actual result [%s]\n", escaped); + } + return -1; + } + if (STRNEQ(escapeStrings[i].escaped, escaped)) { + virtTestDifference(stderr, escapeStrings[i].escaped, escaped); + VIR_FREE(escaped); + return -1; + } + VIR_FREE(escaped); + } + + return 0; +} + +static int testUnescapeArg(const void *data ATTRIBUTE_UNUSED) +{ + int i; + char *unescaped = NULL; + for (i = 0; i < ARRAY_CARDINALITY(escapeStrings); ++i) { + unescaped = qemuMonitorUnescapeArg(escapeStrings[i].escaped); + if (!unescaped) { + if (virTestGetDebug() > 0) { + fprintf(stderr, "\nEscaped string [%s]\n", escapeStrings[i].escaped); + fprintf(stderr, "Expect result [%s]\n", escapeStrings[i].unescaped); + fprintf(stderr, "Actual result [%s]\n", unescaped); + } + return -1; + } + if (STRNEQ(escapeStrings[i].unescaped, unescaped)) { + virtTestDifference(stderr, escapeStrings[i].unescaped, unescaped); + VIR_FREE(unescaped); + return -1; + } + VIR_FREE(unescaped); + } + + return 0; +} + +static int +mymain(void) +{ + int result = 0; + +#define DO_TEST(_name) \ + do { \ + if (virtTestRun("qemu monitor "#_name, 1, test##_name, \ + NULL) < 0) { \ + result = -1; \ + } \ + } while (0) + + DO_TEST(EscapeArg); + DO_TEST(UnescapeArg); + + return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) + +#else +# include "testutils.h" + +int main(void) +{ + return EXIT_AM_SKIP; +} + +#endif /* WITH_QEMU */ -- 1.7.1

2 2

[libvirt] [virsh] [PATCH BZ#732364] please add a .virsh/rc file
by Feniks Gordon Freeman 27 Feb '12

27 Feb '12

Hi, libvirt developers I found very interesting libvirt and i wrote patch for BZ#732264 I added support for parsing ~/.virsh/rc file. rc file in format KEY = VALUE symbol '#' - comment Now, only one value added for parsing - VIRSH_DEFAULT_CONNECT_URI. This value can be overwrite by env variable VIRSH_DEFAULT_CONNECT_URI. Thanks P.S. How to add patch file? As attached file or in mail body? P.P.S. I am using irc, my nick - fenksa --- diff --git a/tools/virsh.c b/tools/virsh.c index e712e53..8360c57 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -33,6 +33,7 @@ #include <signal.h> #include <poll.h> #include <strings.h> +#include <pwd.h> #include <libxml/parser.h> #include <libxml/tree.h> @@ -19313,6 +19314,132 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) return true; } +#define DEFAULT_RC_FILENAME ".virsh/rc" + +static const char* +vshRcPath(vshControl* ctl) { + const char* home; + char* path; + + home = virGetUserDirectory(getuid()); + path = vshMalloc(ctl, strlen(home) + strlen(DEFAULT_RC_FILENAME) + 2); + + memcpy(path, home, strlen(home)); + path[strlen(home)] = '/'; + memcpy(path + strlen(home) + 1, DEFAULT_RC_FILENAME, strlen(DEFAULT_RC_FILENAME)); + + VIR_FREE(home); + + return path; +} + +typedef struct { + char* buf; + int len; + int p; +} RcParseBuffer; + +static void +vshClearRcParseBuffer(RcParseBuffer* buf) { + buf->p = 0; + bzero(buf->buf, buf->len); +} + +static void +vshInitRcParseBuffer(vshControl* ctl, RcParseBuffer* buf, int len) { + buf->buf = vshMalloc(ctl, len); + buf->len = len; + vshClearRcParseBuffer(buf); +}; + +static void +vshAddCharRcParseBuffer(RcParseBuffer* buf, char ch) { + if (buf->p < buf->len) { + buf->buf[buf->p] = ch; + buf->p = buf->p + 1; + } +} + +static void +vshParseRc(vshControl *ctl) +{ + int fd; + const char* fileName = vshRcPath(ctl); + bool parseValue = false; + + RcParseBuffer keyBuffer; + RcParseBuffer valueBuffer; + char buffer[1024]; + + vshInitRcParseBuffer(ctl, &keyBuffer, 255); + vshInitRcParseBuffer(ctl, &valueBuffer, 255); + + /* open ~/.virsh/rc file */ + if ((fd = open(fileName, O_RDONLY)) <= 0) { + vshDebug(ctl, VSH_ERR_INFO, "can't open file %s\n", fileName); + goto cleanup; + } + + struct stat statBuf; + if (fstat(fd, &statBuf) == -1) { + vshDebug(ctl, VSH_ERR_INFO, "file %s not stated\n", fileName); + goto cleanup; + } + + if (!S_ISREG(statBuf.st_mode)) { + vshError(ctl, _("file %s is not regular\n"), fileName); + goto cleanup; + } + + int bytesRead; + while ((bytesRead = read(fd, buffer, sizeof(buffer))) > 0) { + for (int i = 0; i < bytesRead; i++) { + /* ignore empty spaces and comments */ + if (buffer[i] == ' ' || buffer[i] == '#') { + continue; + } + + /* found separator = */ + if (buffer[i] == '=') { + if (!parseValue) { + parseValue = true; + continue; + } + } + + /* end of line*/ + if (buffer[i] == '\n') { + if (STREQ(keyBuffer.buf, "VIRSH_DEFAULT_CONNECT_URI")) { + ctl->name = vshStrdup(ctl, valueBuffer.buf); + } + + vshClearRcParseBuffer(&keyBuffer); + vshClearRcParseBuffer(&valueBuffer); + + parseValue = false; + continue; + } + + if (parseValue) { + vshAddCharRcParseBuffer(&valueBuffer, buffer[i]); + } else { + vshAddCharRcParseBuffer(&keyBuffer, buffer[i]); + } + } + } + +cleanup: + if (fd >= 0) { + if (close(fd) < 0) { + vshError(ctl, _("cannot close file %s"), fileName); + } + } + VIR_FREE(fileName); + VIR_FREE(keyBuffer.buf); + VIR_FREE(valueBuffer.buf); +} + + int main(int argc, char **argv) { @@ -19355,6 +19482,8 @@ main(int argc, char **argv) else progname++; + vshParseRc(ctl); + if ((defaultConn = getenv("VIRSH_DEFAULT_CONNECT_URI"))) { ctl->name = vshStrdup(ctl, defaultConn); } -- With best wishes, Maxim Sditanov

2 2

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

27 Feb '12

Yet another spin of the console corruption patches. Current state: * 1/7 - pidfile: Make checking binary path in virPidFileRead optional - No changes to v4. - ACKed by Eric * 2/7 - Add flags for virDomainOpenConsole - No changes to v4. - ACKed by Eric * 3/7 - virsh: add support for VIR_DOMAIN_CONSOLE_* flags - No changes to v4. - ACKed by Eric * 4/7 - fdstream: Emit stream abort callback even if poll() doesnt. - Tweaked according to Eric's review * 5/7 - fdstream: Add internal callback on stream close - Tweaked according to Eric's review * 6/7 - util: Add helpers for safe domain console operations - Tweaked according to Eric's review * 7/7 - qemu: Add ability to abort existing console while creating new one - No changes to v4. - ACKed by Eric 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 | 25 +++ include/libvirt/libvirt.h.in | 12 ++ po/POTFILES.in | 1 + src/Makefile.am | 6 +- src/conf/virconsole.c | 408 ++++++++++++++++++++++++++++++++++++++++++ src/conf/virconsole.h | 36 ++++ src/fdstream.c | 97 ++++++++++- src/fdstream.h | 13 ++- src/libvirt.c | 18 ++- 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, 680 insertions(+), 32 deletions(-) create mode 100644 src/conf/virconsole.c create mode 100644 src/conf/virconsole.h -- 1.7.3.4

2 10

[libvirt] [virsh] [PATCH BZ#732364] please add a .virsh/rc file
by Feniks Gordon Freeman 27 Feb '12

27 Feb '12

Hi, libvirt developers I found very interesting libvirt and i wrote patch for BZ#732264 I added support for parsing ~/.virsh/rc file. rc file in format KEY = VALUE symbol '#' - comment Now, only one value added for parsing - VIRSH_DEFAULT_CONNECT_URI. This value can be overwrite by env variable VIRSH_DEFAULT_CONNECT_URI. Thanks P.S. How to add patch file? As attached file or in mail body? P.P.S. I am using irc, my nick - fenksa --- diff --git a/tools/virsh.c b/tools/virsh.c index e712e53..8360c57 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -33,6 +33,7 @@ #include <signal.h> #include <poll.h> #include <strings.h> +#include <pwd.h> #include <libxml/parser.h> #include <libxml/tree.h> @@ -19313,6 +19314,132 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) return true; } +#define DEFAULT_RC_FILENAME ".virsh/rc" + +static const char* +vshRcPath(vshControl* ctl) { + const char* home; + char* path; + + home = virGetUserDirectory(getuid()); + path = vshMalloc(ctl, strlen(home) + strlen(DEFAULT_RC_FILENAME) + 2); + + memcpy(path, home, strlen(home)); + path[strlen(home)] = '/'; + memcpy(path + strlen(home) + 1, DEFAULT_RC_FILENAME, strlen(DEFAULT_RC_FILENAME)); + + VIR_FREE(home); + + return path; +} + +typedef struct { + char* buf; + int len; + int p; +} RcParseBuffer; + +static void +vshClearRcParseBuffer(RcParseBuffer* buf) { + buf->p = 0; + bzero(buf->buf, buf->len); +} + +static void +vshInitRcParseBuffer(vshControl* ctl, RcParseBuffer* buf, int len) { + buf->buf = vshMalloc(ctl, len); + buf->len = len; + vshClearRcParseBuffer(buf); +}; + +static void +vshAddCharRcParseBuffer(RcParseBuffer* buf, char ch) { + if (buf->p < buf->len) { + buf->buf[buf->p] = ch; + buf->p = buf->p + 1; + } +} + +static void +vshParseRc(vshControl *ctl) +{ + int fd; + const char* fileName = vshRcPath(ctl); + bool parseValue = false; + + RcParseBuffer keyBuffer; + RcParseBuffer valueBuffer; + char buffer[1024]; + + vshInitRcParseBuffer(ctl, &keyBuffer, 255); + vshInitRcParseBuffer(ctl, &valueBuffer, 255); + + /* open ~/.virsh/rc file */ + if ((fd = open(fileName, O_RDONLY)) <= 0) { + vshDebug(ctl, VSH_ERR_INFO, "can't open file %s\n", fileName); + goto cleanup; + } + + struct stat statBuf; + if (fstat(fd, &statBuf) == -1) { + vshDebug(ctl, VSH_ERR_INFO, "file %s not stated\n", fileName); + goto cleanup; + } + + if (!S_ISREG(statBuf.st_mode)) { + vshError(ctl, _("file %s is not regular\n"), fileName); + goto cleanup; + } + + int bytesRead; + while ((bytesRead = read(fd, buffer, sizeof(buffer))) > 0) { + for (int i = 0; i < bytesRead; i++) { + /* ignore empty spaces and comments */ + if (buffer[i] == ' ' || buffer[i] == '#') { + continue; + } + + /* found separator = */ + if (buffer[i] == '=') { + if (!parseValue) { + parseValue = true; + continue; + } + } + + /* end of line*/ + if (buffer[i] == '\n') { + if (STREQ(keyBuffer.buf, "VIRSH_DEFAULT_CONNECT_URI")) { + ctl->name = vshStrdup(ctl, valueBuffer.buf); + } + + vshClearRcParseBuffer(&keyBuffer); + vshClearRcParseBuffer(&valueBuffer); + + parseValue = false; + continue; + } + + if (parseValue) { + vshAddCharRcParseBuffer(&valueBuffer, buffer[i]); + } else { + vshAddCharRcParseBuffer(&keyBuffer, buffer[i]); + } + } + } + +cleanup: + if (fd >= 0) { + if (close(fd) < 0) { + vshError(ctl, _("cannot close file %s"), fileName); + } + } + VIR_FREE(fileName); + VIR_FREE(keyBuffer.buf); + VIR_FREE(valueBuffer.buf); +} + + int main(int argc, char **argv) { @@ -19355,6 +19482,8 @@ main(int argc, char **argv) else progname++; + vshParseRc(ctl); + if ((defaultConn = getenv("VIRSH_DEFAULT_CONNECT_URI"))) { ctl->name = vshStrdup(ctl, defaultConn); } -- With best wishes, Maxim Sditanov

1 0

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

27 Feb '12

This is counterpart for virDomainPMSuspendForDuration API which we have already in. It allows user to wake up guest from S3 state. 1/3 is already ACKed, but I am sending it for the completeness sake. 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 | 55 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 19 ++++++++++++++ src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 21 ++++++++++++++++ src/qemu/qemu_monitor_json.h | 2 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 8 +++++- src/remote_protocol-structs | 5 ++++ tools/virsh.c | 46 +++++++++++++++++++++++++++++++++++ tools/virsh.pod | 6 ++++ 14 files changed, 221 insertions(+), 1 deletions(-) -- 1.7.3.4

2 9