- Devel - libvirt List Archives

[libvirt] [PATCH] Change my email domain
by Jim Fehlig 01 Sep '11

01 Sep '11

I'd like to change my primary email address to jfehlig(a)suse.com. This patch changes it in AUTHORS and .mailmap. --- .mailmap | 3 ++- AUTHORS | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index cdfd9fd..2795047 100644 --- a/.mailmap +++ b/.mailmap @@ -13,7 +13,8 @@ <meyering(a)redhat.com> <jim(a)meyering.net> <socketpair(a)gmail.com> <socketpair gmail com> <soren(a)linux2go.dk> <soren(a)ubuntu.com> -<jfehlig(a)novell.com> <jfehlig(a)linux-ypgk.site> +<jfehlig(a)suse.com> <jfehlig(a)novell.com> +<jfehlig(a)suse.com> <jfehlig(a)linux-ypgk.site> <jclift(a)redhat.com> <justin(a)salasaga.org> <berrange(a)redhat.com> <dan(a)berrange.com> <soren(a)linux2go.dk> <soren(a)canonical.com> diff --git a/AUTHORS b/AUTHORS index 6cf2cd5..3dc34e9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,7 +13,7 @@ The primary maintainers and people with commit access rights: Mark McLoughlin <markmc(a)redhat.com> Anthony Liguori <aliguori(a)us.ibm.com> Jim Meyering <meyering(a)redhat.com> - Jim Fehlig <jfehlig(a)novell.com> + Jim Fehlig <jfehlig(a)suse.com> Chris Lalancette <clalance(a)redhat.com> Cole Robinson <crobinso(a)redhat.com> Guido Günther <agx(a)sigxcpu.org> -- 1.7.5.4

2 2

[libvirt] [PATCHv3 00/43] cleaned up snapshot series
by Eric Blake 01 Sep '11

01 Sep '11

As promised, here is my v3, which includes all the self-replies I was scattering throughout v2: https://www.redhat.com/archives/libvir-list/2011-August/msg00620.html Also available here: git fetch git://repo.or.cz/libvirt/ericb.git snapshot or browse online at: http://repo.or.cz/w/libvirt/ericb.git/shortlog/refs/heads/snapshot I've tested that this can create external disk snapshots with SELinux running using the qemu snapshot_blkdev monitor command, then deleting the metadata for those snapshots. Other things from my RFC still remain to be coded: https://www.redhat.com/archives/libvir-list/2011-August/msg00361.html support for offline external disk snapshots support for more flags (such as starting an offline snapshot on revert) support for revert and delete of disk snapshots new apis for easier manipulation of snapshot hierarchies Eric Blake (43): snapshot: better event when reverting qemu to paused snapshot snapshot: improve reverting to qemu paused snapshots snapshot: properly revert qemu to offline snapshots snapshot: don't leak resources on qemu snapshot failure snapshot: only pass snapshot to qemu command line when reverting snapshot: track current snapshot across restarts snapshot: allow deletion of just snapshot metadata snapshot: avoid crash when deleting qemu snapshots snapshot: simplify acting on just children snapshot: let qemu discard only snapshot metadata snapshot: identify which snapshots have metadata snapshot: identify qemu snapshot roots snapshot: prevent stranding snapshot data on domain destruction snapshot: refactor some qemu code snapshot: cache qemu-img location snapshot: support new undefine flags in qemu snapshot: teach virsh about new undefine flags snapshot: prevent migration from stranding snapshot data snapshot: refactor domain xml output snapshot: allow full domain xml in snapshot snapshot: correctly escape generated xml snapshot: update rng to support full domain in xml snapshot: store qemu domain details in xml snapshot: additions to domain xml for disks snapshot: reject transient disks where code is not ready snapshot: reflect recent options in virsh snapshot: introduce new deletion flag snapshot: expose new delete flag in virsh snapshot: allow halting after snapshot snapshot: refactor virsh snapshot creation snapshot: expose halt-after-creation in virsh snapshot: wire up new qemu monitor command snapshot: support extra state in snapshots snapshot: add <disks> to snapshot xml snapshot: also support disks by path snapshot: add virsh domblklist command snapshot: add flag for requesting disk snapshot snapshot: reject unimplemented disk snapshot features snapshot: make it possible to audit external snapshot snapshot: wire up disk-only flag to snapshot-create snapshot: wire up live qemu disk snapshots snapshot: refactor qemu file opening snapshot: use SELinux and lock manager with external snapshots docs/formatdomain.html.in | 40 +- docs/formatsnapshot.html.in | 253 ++- docs/schemas/Makefile.am | 1 + docs/schemas/domain.rng | 2555 +------------------- docs/schemas/{domain.rng => domaincommon.rng} | 32 +- docs/schemas/domainsnapshot.rng | 89 +- include/libvirt/libvirt.h.in | 62 +- src/conf/domain_audit.c | 12 +- src/conf/domain_audit.h | 4 +- src/conf/domain_conf.c | 861 ++++++-- src/conf/domain_conf.h | 75 +- src/esx/esx_driver.c | 41 +- src/libvirt.c | 132 +- src/libvirt_private.syms | 8 + src/libxl/libxl_conf.c | 5 + src/libxl/libxl_driver.c | 11 +- src/qemu/qemu_command.c | 12 +- src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 1611 +++++++++---- src/qemu/qemu_hotplug.c | 18 +- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 24 + src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 33 + src/qemu/qemu_monitor_json.h | 4 + src/qemu/qemu_monitor_text.c | 40 + src/qemu/qemu_monitor_text.h | 4 + src/qemu/qemu_process.c | 21 +- src/qemu/qemu_process.h | 1 + src/uml/uml_driver.c | 56 +- src/vbox/vbox_tmpl.c | 46 +- src/xen/xend_internal.c | 12 +- src/xenxs/xen_sxpr.c | 5 + src/xenxs/xen_xm.c | 5 + tests/domainsnapshotxml2xmlin/disk_snapshot.xml | 16 + tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 77 + tests/domainsnapshotxml2xmlout/full_domain.xml | 35 + .../qemuxml2argv-disk-snapshot.args | 7 + .../qemuxml2argv-disk-snapshot.xml | 39 + .../qemuxml2argv-disk-transient.xml | 27 + tests/qemuxml2argvtest.c | 2 + tools/virsh.c | 755 +++++- tools/virsh.pod | 111 +- 43 files changed, 3616 insertions(+), 3533 deletions(-) copy docs/schemas/{domain.rng => domaincommon.rng} (98%) create mode 100644 tests/domainsnapshotxml2xmlin/disk_snapshot.xml create mode 100644 tests/domainsnapshotxml2xmlout/disk_snapshot.xml create mode 100644 tests/domainsnapshotxml2xmlout/full_domain.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-transient.xml -- 1.7.4.4

2 78

[libvirt] Problems with "attach-interface" command of libvirt
by Tao Siheng 01 Sep '11

01 Sep '11

Dear libvirt-developer: I'm a student of computer science and technology in China. I encountered a problem when I want to attach a bridge to an existed Virtual Machine. I used the command "attach-interface domain_id bridge br0 --target tap0". "br0" was created by brctl and "tap0" was created by tunctl.Here is the error information: error: Failed to attach interface error: internal error unable to send TAP file handle: No file descriptor supplied via SCM_RIGHTS. I know there are some bugs in the earlier version of libvirt. So I upgraded the ubuntu kernel to 2.6.38.8 and added the module "macvtap" by the using the command "sudo modprobe macvtap". I have installed libvirt0.8.8, QEMU 0.8.8 and QEMU 0.12.3.Although I did all the above, the problem is still not solved. I need your help sincerely. Tao Siheng 2011.9.1

1 0

[libvirt] [PATCH] virsh: improve send-key documentation
by Eric Blake 01 Sep '11

01 Sep '11

The 'virsh man' description of send-key was incomplete and used the old style (literal 'optional name' instead of '[name]' metasyntax). Meanwhile, none of the other virsh help texts include examples, so I moved it out of virsh help and into the man page. * tools/virsh.pod (send-key): Give better details. * tools/virsh.c (info_send_key): Drop example from here. --- Red Hat QE found this: https://bugzilla.redhat.com/show_bug.cgi?id=699847 tools/virsh.c | 13 ++++--------- tools/virsh.pod | 20 +++++++++++++++++--- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 49034ae..8500a03 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3718,21 +3718,16 @@ cmdInjectNMI(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_send_key[] = { {"help", N_("Send keycodes to the guest")}, - {"desc", N_("Send keycodes to the guest, the keycodes must be integers\n" - " Examples:\n\n" - " virsh # send-key <domain> 37 18 21\n" - " virsh # send-key <domain> KEY_RIGHTCTRL KEY_C\n" - " virsh # send-key <domain> --codeset xt 37 18 21\n" - " virsh # send-key <domain> --holdtime 1000 0x15 18 0xf\n" - )}, + {"desc", N_("Send keycodes (integers or symbolic names) to the guest")}, {NULL, NULL} }; static const vshCmdOptDef opts_send_key[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"codeset", VSH_OT_STRING, VSH_OFLAG_REQ_OPT, N_("the codeset of keycodes, default:linux")}, + {"codeset", VSH_OT_STRING, VSH_OFLAG_REQ_OPT, + N_("the codeset of keycodes, default:linux")}, {"holdtime", VSH_OT_INT, VSH_OFLAG_REQ_OPT, - N_("the time (in millsecond) how long the keys will be held")}, + N_("the time (in millseconds) how long the keys will be held")}, {"keycode", VSH_OT_ARGV, VSH_OFLAG_REQ, N_("the key code")}, {NULL, 0, 0, NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index 2cd0f73..5c417f9 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -310,9 +310,23 @@ running B<virsh suspend>. When in a paused state the domain will still consume allocated resources like memory, but will not be eligible for scheduling by the hypervisor. -=item B<send-key> I<domain-id> optional I<--codeset> B<codeset> optional I<--holdtime> B<holdtime> B<keycode>... - -Send keys to the guest +=item B<send-key> I<domain-id> [I<--codeset> B<codeset>] +[I<--holdtime> B<holdtime>] I<keycode>... + +Parse the I<keycode> sequence as keystrokes to send to I<domain-id>. +Each I<keycode> can either be a numeric value or a symbolic name from +the corresponding codeset. The default code set is B<linux>, but +use of I<--codeset> can specify B<xt>, B<atset1>, B<atset2>, B<atset3>, +B<os_x>, B<xt_kbd>, B<usb>, B<win32>, or B<rfb> instead. If I<--holdtime> +is given, each keystroke will be held for that many milliseconds. + +B<Examples> + # send three strokes 'k', 'e', 'y', using xt codeset + virsh send-key dom --codeset xt 37 18 21 + # send one stroke 'right-ctrl+C' + virsh send-key dom KEY_RIGHTCTRL KEY_C + # send a tab, held for 1 second + virsh send-key --holdtime 1000 0xf =item B<shutdown> -- 1.7.4.4

2 4

[libvirt] [PATCH] build: fix 'make check' with pdwtags
by Eric Blake 01 Sep '11

01 Sep '11

Problem introduced by commit b12354b. * src/remote_protocol-structs: Remove spurious blank line. --- Pushing under the build-breaker rule. It only affects people that have pdwtags (from the dwarves package) installed. src/remote_protocol-structs | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 0498bd1..bb5ec44 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1436,7 +1436,6 @@ struct remote_domain_migrate_get_max_speed_args { struct remote_domain_migrate_get_max_speed_ret { uint64_t bandwidth; }; - struct remote_domain_events_register_any_args { int eventID; }; -- 1.7.4.4

1 0

[libvirt] [PATCH] virsh: prefer unsigned flags
by Eric Blake 01 Sep '11

01 Sep '11

* tools/virsh.c (cmdUndefine, cmdSave, cmdSaveImageDumpxml) (cmdSaveImageEdit, cmdManagedSave, cmdRestore, cmdDump) (cmdVcpuPin, cmdSetvcpus, cmdSetmem, cmdSetmaxmem, cmdDumpXML) (cmdDomXMLFromNative, cmdDomXMLToNative, doMigrate) (cmdInterfaceEdit, cmdInterfaceDumpXML, cmdEdit): Match coding style for flags. --- tools/virsh.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index ee5d3bf..c360a20 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1443,7 +1443,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; bool ret = true; const char *name = NULL; - int flags = 0; + unsigned int flags = 0; int managed_save = vshCommandOptBool(cmd, "managed-save"); int has_managed_save = 0; int rc = -1; @@ -1651,7 +1651,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) const char *name = NULL; const char *to = NULL; bool ret = false; - int flags = 0; + unsigned int flags = 0; const char *xmlfile = NULL; char *xml = NULL; @@ -1713,7 +1713,7 @@ cmdSaveImageDumpxml(vshControl *ctl, const vshCmd *cmd) { const char *file = NULL; bool ret = false; - int flags = 0; + unsigned int flags = 0; char *xml = NULL; if (vshCommandOptBool(cmd, "security-info")) @@ -1810,7 +1810,7 @@ cmdSaveImageEdit(vshControl *ctl, const vshCmd *cmd) char *tmp = NULL; char *doc = NULL; char *doc_edited = NULL; - int flags = VIR_DOMAIN_XML_SECURE; + unsigned int flags = VIR_DOMAIN_XML_SECURE; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -1888,7 +1888,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; const char *name; bool ret = false; - int flags = 0; + unsigned int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -2246,7 +2246,7 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) { const char *from = NULL; bool ret = false; - int flags = 0; + unsigned int flags = 0; const char *xmlfile = NULL; char *xml = NULL; @@ -2309,7 +2309,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) const char *name = NULL; const char *to = NULL; bool ret = false; - int flags = 0; + unsigned int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -3412,7 +3412,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) int live = vshCommandOptBool(cmd, "live"); int current = vshCommandOptBool(cmd, "current"); bool query = false; /* Query mode if no cpulist */ - int flags = 0; + unsigned int flags = 0; if (current) { if (live || config) { @@ -3645,7 +3645,7 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) int config = vshCommandOptBool(cmd, "config"); int live = vshCommandOptBool(cmd, "live"); int current = vshCommandOptBool(cmd, "current"); - int flags = 0; + unsigned int flags = 0; if (current) { if (live || config) { @@ -3859,7 +3859,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) int config = vshCommandOptBool(cmd, "config"); int live = vshCommandOptBool(cmd, "live"); int current = vshCommandOptBool(cmd, "current"); - int flags = 0; + unsigned int flags = 0; if (current) { if (live || config) { @@ -3948,7 +3948,7 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) int config = vshCommandOptBool(cmd, "config"); int live = vshCommandOptBool(cmd, "live"); int current = vshCommandOptBool(cmd, "current"); - int flags = VIR_DOMAIN_MEM_MAXIMUM; + unsigned int flags = VIR_DOMAIN_MEM_MAXIMUM; if (current) { if (live || config) { @@ -4612,7 +4612,7 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; bool ret = true; char *dump; - int flags = 0; + unsigned int flags = 0; int inactive = vshCommandOptBool(cmd, "inactive"); int secure = vshCommandOptBool(cmd, "security-info"); int update = vshCommandOptBool(cmd, "update-cpu"); @@ -4665,7 +4665,7 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) const char *configFile = NULL; char *configData; char *xmlData; - int flags = 0; + unsigned int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -4711,7 +4711,7 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) const char *xmlFile = NULL; char *configData; char *xmlData; - int flags = 0; + unsigned int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -4879,7 +4879,7 @@ doMigrate (void *opaque) const char *desturi = NULL; const char *migrateuri = NULL; const char *dname = NULL; - int flags = 0; + unsigned int flags = 0; vshCtrlData *data = opaque; vshControl *ctl = data->ctl; const vshCmd *cmd = data->cmd; @@ -5653,7 +5653,7 @@ cmdInterfaceEdit (vshControl *ctl, const vshCmd *cmd) char *doc = NULL; char *doc_edited = NULL; char *doc_reread = NULL; - int flags = VIR_INTERFACE_XML_INACTIVE; + unsigned int flags = VIR_INTERFACE_XML_INACTIVE; if (!vshConnectionUsability(ctl, ctl->conn)) goto cleanup; @@ -6194,7 +6194,7 @@ cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) virInterfacePtr iface; bool ret = true; char *dump; - int flags = 0; + unsigned int flags = 0; int inactive = vshCommandOptBool(cmd, "inactive"); if (inactive) @@ -11696,7 +11696,7 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) char *doc = NULL; char *doc_edited = NULL; char *doc_reread = NULL; - int flags = VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_INACTIVE; + unsigned int flags = VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_INACTIVE; if (!vshConnectionUsability(ctl, ctl->conn)) goto cleanup; -- 1.7.4.4

2 2

[libvirt] [PATCH 0/6] Support online block resizing
by Osier Yang 01 Sep '11

01 Sep '11

Upstream QEMU introduced online block resizing to resize the block device when domain is running since commit 6d4a2b3a4795. It simply reuses existing "bdrv_truncate" method which is used by "qemu-img" to resize the images. This means it supports to resize all the format that "qemu-img resize" supports. E.g. qcow2, raw, qed, qcow, etc. (NB, it doesn't support to shrink size of qcow2 image, and QEMU reports "An undefined error has ocurred" in this case). For block device of virtio bus, the guest can update the device size automatically, needs kernel support, since kernel-2.6.32-117: http://patchwork.usersys.redhat.com/patch/33040/ For block device of SCSI bus, one needs to execute command like below in the guest (linux) to update the size: % echo > /sys/class/scsi_device/0:0:0:0/device/rescan For block device of IDE bus, seems there is no way to let guest update the size after resizing. The new API is defined as: int virDomainBlockResize (virDomainPtr dom, const char *device, unsigned long long size, unsigned int flags) * @device is the name of block device, E.g. vda, vdb. * Units for @size is KB. [PATCH 1/6] block_resize: Define the new API [PATCH 2/6] block_resize: Implemente the public API [PATCH 3/6] block_resize: Wire up the remote protocol [PATCH 4/6] block_resize: Implemente the qemu monitor functions [PATCH 5/6] block_resize: Implemente the internal API for qemu [PATCH 6/6] block_resize: Expose the new API in virsh Regards, Osier

2 9

[libvirt] [v2 00/13] various USB support improvements
by Marc-André Lureau 01 Sep '11

01 Sep '11

Hola, This is the second version of the patch set which should address most of the comments I recieved. It should be good enough to let virt-manager & co support USB2 & usb-redirection. Some of the auto-assign of USB addresses etc.. are leftover for future improvements. It should not introduce regressions. Marc-André Lureau (13): Add various USB devices QEMU_CAPS Split virDomainControllerModel to virDomainControllerModelSCSI Add USB controller models Add a new controller type 'usb' with optionnal 'model' USB controller can have a PCI address child element USB devices gain a new USB address child element Add USB companion controllers support Add USB hub device Modify USB port to be defined as a port path qemu: don't reserve slot 1 if a PIIX3 USB controller is defined there qemu: Don't append 0 at usb id, so that it is compatible with legacy -usb Add a usb1 & usb2 qemuxml2argv test Add usb-redir device docs/formatdomain.html.in | 81 ++++- docs/schemas/domain.rng | 122 +++++-- src/conf/domain_conf.c | 369 +++++++++++++++++++- src/conf/domain_conf.h | 82 ++++- src/esx/esx_driver.c | 8 +- src/libvirt_private.syms | 8 +- src/qemu/qemu_capabilities.c | 28 ++ src/qemu/qemu_capabilities.h | 9 + src/qemu/qemu_cgroup.c | 3 +- src/qemu/qemu_command.c | 284 ++++++++++++++-- src/qemu/qemu_command.h | 10 +- src/qemu/qemu_hostdev.c | 2 + src/qemu/qemu_hotplug.c | 66 ++++- src/qemu/qemu_hotplug.h | 3 + src/security/security_dac.c | 6 + src/security/security_selinux.c | 6 + src/vmx/vmx.c | 32 +- tests/qemuhelptest.c | 17 +- .../qemuxml2argv-input-usbmouse-addr.args | 1 + .../qemuxml2argv-input-usbmouse-addr.xml | 27 ++ .../qemuxml2argv-usb-controller.args | 1 + .../qemuxml2argv-usb-controller.xml | 16 + tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-usb-hub.xml | 19 + .../qemuxml2argv-usb-ich9-companion.args | 6 + .../qemuxml2argv-usb-ich9-companion.xml | 30 ++ .../qemuxml2argv-usb-ich9-ehci-addr.args | 1 + .../qemuxml2argv-usb-ich9-ehci-addr.xml | 18 + .../qemuxml2argv-usb-piix3-controller.args | 1 + .../qemuxml2argv-usb-piix3-controller.xml | 16 + tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-usb-ports.xml | 31 ++ tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 8 + tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml | 33 ++ tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args | 15 + tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.xml | 74 ++++ tests/qemuxml2argvtest.c | 29 ++ tests/xml2vmxtest.c | 2 +- 38 files changed, 1350 insertions(+), 116 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-controller.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ports.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.xml -- 1.7.6

2 26

[libvirt] [PATCH] Source control for storage pool
by Lei Li 01 Sep '11

01 Sep '11

Fix bug #611823 storage driver should prohibit pools with duplicate underlying storage. Add API virStoragePoolSourceFindDuplicate() to do uniqueness check based on source location infomation for pool type. Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> --- src/conf/storage_conf.c | 73 ++++++++++++++++++++++++++++++++++++++++++ src/conf/storage_conf.h | 3 ++ src/libvirt_private.syms | 1 + src/storage/storage_driver.c | 6 +++ 4 files changed, 83 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 8d14e87..698334e 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1701,6 +1701,79 @@ cleanup: return ret; } +int virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def) +{ + int i, j, k; + int ret = 1; + virStoragePoolObjPtr pool = NULL; + virStoragePoolObjPtr matchpool = NULL; + + /* Check the pool list for duplicate underlying storage */ + for (i = 0; i < pools->count; i++) { + pool = pools->objs[i]; + if (def->type != pool->def->type) + continue; + + virStoragePoolObjLock(pool); + if (pool->def->type == VIR_STORAGE_POOL_DIR) { + if (STREQ(pool->def->target.path, def->target.path)) { + matchpool = pool; + goto cleanup; + } + } else if (pool->def->type == VIR_STORAGE_POOL_NETFS) { + if ((STREQ(pool->def->source.dir, def->source.dir)) \ + && (STREQ(pool->def->source.host.name, def->source.host.name))) { + matchpool = pool; + goto cleanup; + } + } else if (pool->def->type == VIR_STORAGE_POOL_SCSI) { + if (STREQ(pool->def->source.adapter, def->source.adapter)) { + matchpool = pool; + goto cleanup; + } + } else if (pool->def->type == VIR_STORAGE_POOL_ISCSI) { + for (j = 0; j < pool->def->source.ndevice; j++) { + for (k = 0; k < def->source.ndevice; k++) { + if (pool->def->source.initiator.iqn) { + if ((STREQ(pool->def->source.devices[j].path, def->source.devices[k].path)) \ + && (STREQ(pool->def->source.initiator.iqn, def->source.initiator.iqn))) { + matchpool = pool; + goto cleanup; + } + } else if (pool->def->source.host.name) { + if ((STREQ(pool->def->source.devices[j].path, def->source.devices[k].path)) \ + && (STREQ(pool->def->source.host.name, def->source.host.name))) { + matchpool = pool; + goto cleanup; + } + } + } + } + } else { + /* For the remain three pool type 'fs''logical''disk' that all use device path */ + if (pool->def->source.ndevice) { + for (j = 0; j < pool->def->source.ndevice; j++) { + for (k = 0; k < def->source.ndevice; k++) { + if (STREQ(pool->def->source.devices[j].path, def->source.devices[k].path)) { + matchpool = pool; + goto cleanup; + } + } + } + } + } + virStoragePoolObjUnlock(pool); + } +cleanup: + if (matchpool) { + virStoragePoolObjUnlock(matchpool); + virStorageReportError(VIR_ERR_OPERATION_FAILED, + _("pool source location info is duplicate")); + ret = -1; + } + return ret; +} void virStoragePoolObjLock(virStoragePoolObjPtr obj) { diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 271441a..a8562a6 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -388,6 +388,9 @@ int virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr pools, virStoragePoolDefPtr def, unsigned int check_active); +int virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def); + void virStoragePoolObjLock(virStoragePoolObjPtr obj); void virStoragePoolObjUnlock(virStoragePoolObjPtr obj); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9f03e30..5899d56 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -948,6 +948,7 @@ virStoragePoolObjDeleteDef; virStoragePoolObjFindByName; virStoragePoolObjFindByUUID; virStoragePoolObjIsDuplicate; +virStoragePoolSourceFindDuplicate; virStoragePoolObjListFree; virStoragePoolObjLock; virStoragePoolObjRemove; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 68cac1f..c05b74e 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -536,6 +536,9 @@ storagePoolCreate(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 1) < 0) goto cleanup; + if (virStoragePoolSourceFindDuplicate(&driver->pools, def) < 0) + goto cleanup; + if ((backend = virStorageBackendForType(def->type)) == NULL) goto cleanup; @@ -589,6 +592,9 @@ storagePoolDefine(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 0) < 0) goto cleanup; + if (virStoragePoolSourceFindDuplicate(&driver->pools, def) < 0) + goto cleanup; + if (virStorageBackendForType(def->type) == NULL) goto cleanup; -- 1.7.1

2 1

[libvirt] [PATCH] qemu: Fix a regression of domain save
by Osier Yang 01 Sep '11

01 Sep '11

* src/qemu/qemu_driver.c - qemuDomainSaveInternal: Return directly will keep the domain object locked. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4e8c691..a150b08 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2223,7 +2223,7 @@ qemuDomainSaveInternal(struct qemud_driver *driver, virDomainPtr dom, if (qemuProcessAutoDestroyActive(driver, vm)) { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is marked for auto destroy")); - return -1; + goto cleanup; } memset(&header, 0, sizeof(header)); -- 1.7.6

2 3