- Devel - libvirt List Archives

[libvirt] Memory leak on list_domains
by Carlos Rodrigues 19 Apr '12

19 Apr '12

Hi, I have some problems on my application with memory leak when call list_domains method. I'm using libvirt 0.8.3 and Sys::Virt 0.2.4 Perl Module. Does anyone have any idea what's the problem? Regards, -- Carlos Rodrigues <cmar(a)eurotux.com> Eurotux Informática, S.A. [http://eurotux.com]

2 2

[libvirt] [libvirt-glib] Add async variant of gvir_domain_get_info()
by Zeeshan Ali (Khattak) 19 Apr '12

19 Apr '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-domain.c | 74 ++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 7 +++ libvirt-gobject/libvirt-gobject.sym | 4 +- 3 files changed, 84 insertions(+), 1 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 0bafa7e..c1a2086 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -572,6 +572,80 @@ GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, return ret; } +static void +gvir_domain_get_info_helper(GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomainInfo *info; + GError *err = NULL; + + info = gvir_domain_get_info(dom, &err); + if (err) + g_simple_async_result_take_error(res, err); + else + g_simple_async_result_set_op_res_gpointer(res, info, NULL); +} + +/** + * gvir_domain_get_info_async: + * @dom: the domain + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_domain_get_info. + */ +void gvir_domain_get_info_async(GVirDomain *dom, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + + g_return_if_fail(GVIR_IS_DOMAIN(dom)); + + res = g_simple_async_result_new(G_OBJECT(dom), + callback, + user_data, + gvir_domain_get_info_async); + g_simple_async_result_run_in_thread(res, + gvir_domain_get_info_helper, + G_PRIORITY_DEFAULT, + cancellable); + g_object_unref(res); +} + +/** + * gvir_domain_get_info_finish: + * @dom: the domain + * @result: (transfer none): async method result + * @err: Place-holder for possible errors + * + * Finishes the operation started by #gvir_domain_get_info_async. + * + * Returns: (transfer full): the info + */ +GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT(result); + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), NULL); + g_return_val_if_fail + (g_simple_async_result_is_valid(result, + G_OBJECT(dom), + gvir_domain_get_info_async), + NULL); + + if (g_simple_async_result_propagate_error(res, err)) + return NULL; + + return g_simple_async_result_get_op_res_gpointer(res); +} + /** * gvir_domain_screenshot: * @stream: stream to use as output diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 8a4836e..677fbe6 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -141,6 +141,13 @@ gboolean gvir_domain_reboot(GVirDomain *dom, GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, GError **err); +void gvir_domain_get_info_async(GVirDomain *dom, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err); GVirConfigDomain *gvir_domain_get_config(GVirDomain *dom, guint flags, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 64c91cc..f43836f 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -1,4 +1,4 @@ -LIBVIRT_GOBJECT_0.0.7 { +LIBVIRT_GOBJECT_0.0.8 { global: gvir_init_object; gvir_init_object_check; @@ -70,6 +70,8 @@ LIBVIRT_GOBJECT_0.0.7 { gvir_domain_set_config; gvir_domain_get_devices; gvir_domain_get_info; + gvir_domain_get_info_async; + gvir_domain_get_info_finish; gvir_domain_get_persistent; gvir_domain_get_saved; gvir_domain_screenshot; -- 1.7.7.6

2 1

[libvirt] [libvirt-glib] Add async variant of gvir_domain_get_info()
by Zeeshan Ali (Khattak) 19 Apr '12

19 Apr '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-domain.c | 74 ++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 7 +++ libvirt-gobject/libvirt-gobject.sym | 2 + 3 files changed, 83 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 0bafa7e..896aae1 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -572,6 +572,80 @@ GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, return ret; } +static void +gvir_domain_get_info_helper(GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirDomain *dom = GVIR_DOMAIN(object); + GVirDomainInfo *info; + GError *err = NULL; + + info = gvir_domain_get_info(dom, &err); + if (err) + g_simple_async_result_take_error(res, err); + else + g_simple_async_result_set_op_res_gpointer(res, info, NULL); +} + +/** + * gir_domain_get_info_async: + * @dom: the domain + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_domain_get_info. + */ +void gvir_domain_get_info_async(GVirDomain *dom, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + + g_return_if_fail(GVIR_IS_DOMAIN(dom)); + + res = g_simple_async_result_new(G_OBJECT(dom), + callback, + user_data, + gvir_domain_get_info_async); + g_simple_async_result_run_in_thread(res, + gvir_domain_get_info_helper, + G_PRIORITY_DEFAULT, + cancellable); + g_object_unref(res); +} + +/** + * gir_domain_get_info_finish: + * @dom: the domain + * @result: (transfer none): async method result + * @err: Place-holder for possible errors + * + * Finishes the operation started by #gvir_domain_get_info_async. + * + * Returns: (transfer full): the info + */ +GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err) +{ + GSimpleAsyncResult *res = G_SIMPLE_ASYNC_RESULT(result); + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail + (g_simple_async_result_is_valid(result, + G_OBJECT(dom), + gvir_domain_get_info_async), + FALSE); + + if (g_simple_async_result_propagate_error(res, err)) + return NULL; + + return g_simple_async_result_get_op_res_gpointer(res); +} + /** * gvir_domain_screenshot: * @stream: stream to use as output diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 8a4836e..677fbe6 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -141,6 +141,13 @@ gboolean gvir_domain_reboot(GVirDomain *dom, GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, GError **err); +void gvir_domain_get_info_async(GVirDomain *dom, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +GVirDomainInfo *gvir_domain_get_info_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err); GVirConfigDomain *gvir_domain_get_config(GVirDomain *dom, guint flags, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 64c91cc..00b32d4 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -70,6 +70,8 @@ LIBVIRT_GOBJECT_0.0.7 { gvir_domain_set_config; gvir_domain_get_devices; gvir_domain_get_info; + gvir_domain_get_info_async; + gvir_domain_get_info_finish; gvir_domain_get_persistent; gvir_domain_get_saved; gvir_domain_screenshot; -- 1.7.7.6

3 4

[libvirt] [libvirt-glib] Correct some minor typos in docs
by Zeeshan Ali (Khattak) 19 Apr '12

19 Apr '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-domain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index c1a2086..7fcd733 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -775,7 +775,7 @@ cleanup: } /** - * gir_domain_suspend: + * gvir_domain_suspend: * @dom: the domain to suspend * @err: Place-holder for possible errors * @@ -857,7 +857,7 @@ gvir_domain_save_helper(GSimpleAsyncResult *res, } /** - * gir_domain_save_async: + * gvir_domain_save_async: * @dom: the domain to save * @flags: extra flags, currently unused * @cancellable: (allow-none)(transfer none): cancellation object @@ -893,7 +893,7 @@ void gvir_domain_save_async (GVirDomain *dom, } /** - * gir_domain_save_finish: + * gvir_domain_save_finish: * @dom: the domain to save * @result: (transfer none): async method result * @err: Place-holder for possible errors -- 1.7.7.6

2 1

[libvirt] [PATCH] virsh: Fix and clarify the --title flag for the list command in man page
by Peter Krempa 19 Apr '12

19 Apr '12

--- tools/virsh.pod | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 140d8e8..25751b6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -398,13 +398,14 @@ may be combined. Default behavior is as though both were specified. (Note that if any of these flags is specified, the check for the persistence state is done and may fail. If none of these flags is specified, the check is skipped.) -If I<--title> is specified, then the domain note is printed. The output then -the output looks as follows. This flag is usable only with the default -I<--table> output. +If I<--title> is specified, then the short domain description - title - is +printed. This flag is usable only with the default I<--table> output. + +Example: B<virsh> list --title Id Name State Title ------------------------------------------------ + ----------------------------------------------- 0 Domain-0 running Mailserver 1 2 fedora paused -- 1.7.3.4

2 3

[libvirt] Call for Proposals: Linux Plumbers Conference (Aug 2012)
by Amit Shah 19 Apr '12

19 Apr '12

Hello, The Call for Proposals for the Linux Plumbers Conf 2012 is out. We're looking for speakers to talk at the Virtualization microconference as well as the main conference. The deadline for proposal submissions is 1st May. This year's edition of LPC is co-located with LinuxCon NA and will be held at San Diego from the 29th to the 31st of August. More details are at: http://www.linuxplumbersconf.org/2012/2012-lpc-call-for-proposals/ Please note: to submit a proposal for the virt microconf, use the 'lpc2012-virt-' prefix in the Name field. LPC is oriented towards solving problems, and good proposal topics are those which are unresolved problems or proposals that need interaction with multiple subsystems. Please see the CFP page linked above for more details. Thanks, Amit

1 0

[libvirt] PXE boot issue with macvtap
by Shradha Shah 19 Apr '12

19 Apr '12

Hello All, I currently have an issue with using macvtap interfaces on KVM. I was wondering if this is a known issue? Also may I request for any ideas on how I should go forward with this issue? Issue: When you try to PXE boot one KVM guest of another KVM guest over a macvtap interface the client does not receive the tftp packets sent by the server and the connection times out. Setup: Both the PXE client and the PXE server are VM's running on the same host, using macvtap on top of a LOM interface for connectivity Reproducible always. Findings of the testing: 1) The issue is seen between guests on the same on the same host and not between guests on different hosts. 2) PXE booting works fine if we're using a linux bridge for connectivity rather than macvtap 3) The initial DHCP stage works fine and the client acquires an IP address, but then the TFTP attempt stalls. 4) The client sends an RRQ to which the server replies with option acknowledgement, which is exactly what should happen. 5) However the client appears not to receive the acknowledgement. 6) Both client and server keep retransmitting their packets for a while, until the client times out and gives up. 7) Observing the ifconfig stats for the host macvtap interface for each guest, the packet counters seemed to show that the packets were being received - so they are dropped somewhere between macvtap on the host and the virtio device in the guest. 8) Tcpdump does not seem to work with macvtap so could not inspect further. -- Many Thanks, Regards, Shradha Shah

1 0

[libvirt] [PATCH] virsh: avoid uninitialized memory usage
by Alex Jia 19 Apr '12

19 Apr '12

Detected by valgrind. * tools/virsh.c (cmdBlockPull): fix uninitialized memory usage. * How to reproduce? $ qemu-img create /var/lib/libvirt/images/test 1M $ cat > /tmp/test.xml <<EOF <domain type='qemu'> <name>test</name> <memory>219200</memory> <vcpu>1</vcpu> <os> <type arch='x86_64'>hvm</type> <boot dev='hd'/> </os> <devices> <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/test'/> <target dev='vda' bus='virtio'/> </disk> <input type='mouse' bus='ps2'/> <graphics type='spice' autoport='yes' listen='0.0.0.0'/> </devices> </domain> EOF $ virsh define /tmp/test.xml $ valgrind -v virsh blockpull test /var/lib/libvirt/images/test --wait actual result: ==10906== 1 errors in context 1 of 1: ==10906== Syscall param rt_sigaction(act->sa_flags) points to uninitialised byte(s) ==10906== at 0x39CF80F5BE: __libc_sigaction (sigaction.c:67) ==10906== by 0x43016C: cmdBlockPull (virsh.c:7638) ==10906== by 0x4150D4: vshCommandRun (virsh.c:18574) ==10906== by 0x425E73: main (virsh.c:20178) ==10906== Address 0x7fefffae8 is on thread 1's stack Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 95ed7bc..4e4ca57 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -7634,6 +7634,7 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) intCaught = 0; sig_action.sa_sigaction = vshCatchInt; + sigemptyset((sigset_t *)&sig_action.sa_flags); sigemptyset(&sig_action.sa_mask); sigaction(SIGINT, &sig_action, &old_sig_action); -- 1.7.1

2 5

[libvirt] [PATCH] util: remove dead casts
by Eric Blake 18 Apr '12

18 Apr '12

The sequence: long long val; if ((long long) val != val) is dead code. * src/util/util.c (virStrToLong_ll, virStrToLong_ull): Remove useless cast. --- Pushing under the trivial rule. src/util/util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 6e041d6..1b39227 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1571,13 +1571,13 @@ virStrToLong_ll(char const *s, char **end_ptr, int base, long long *result) long long val; char *p; int err; errno = 0; val = strtoll(s, &p, base); - err = (errno || (!end_ptr && *p) || p == s || (long long) val != val); + err = (errno || (!end_ptr && *p) || p == s); if (end_ptr) *end_ptr = p; if (err) return -1; *result = val; return 0; @@ -1590,13 +1590,13 @@ virStrToLong_ull(char const *s, char **end_ptr, int base, unsigned long long *re unsigned long long val; char *p; int err; errno = 0; val = strtoull(s, &p, base); - err = (errno || (!end_ptr && *p) || p == s || (unsigned long long) val != val); + err = (errno || (!end_ptr && *p) || p == s); if (end_ptr) *end_ptr = p; if (err) return -1; *result = val; return 0; -- 1.7.7.6

1 0

[libvirt] [PATCH V10 0/7] Add DHCP snooping support to nwfilter
by Stefan Berger 18 Apr '12

18 Apr '12

This series of patches adds DHCP snooping support to libvirt's nwfilter subsystem. DHCP snooping detects DHCP leases obtained by a VM and automatically adjusts the network traffic filters to reflect the IP addresses with which a VM may send its traffic, thus for example preventing IP address spoofing. Once leases on IP addresses expire or if a VM gives up on a lease on an IP address, the filters are also adjusted. All leases are persisted and automatically applied upon a VM's restart. Leases are associated with the tuple of VM-UUID and interface MAC address. The following interface XML activates and uses the DHCP snooping: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='ip_learning' value='dhcp'/> </filterref> </interface> Once an IP address has been detected on an interface, 'virsh dumpxml <vm>' would show the IP address lease in the format <IP address>,<lease timeout in seconds>: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='ip_learning' value='dhcp'/> <parameter name='IP_LEASE' value='192.168.122.210,180'/> </filterref> </interface> Regards, David and Stefan

2 15

[libvirt] [PATCH v2 0/9] Add basic driver for Parallels Virtuozzo Server
by Dmitry Guryanov 18 Apr '12

18 Apr '12

Parallels Virtuozzo Server is a cloud-ready virtualization solution that allows users to simultaneously run multiple virtual machines and containers on the same physical server. Current name of this product is Parallels Server Bare Metal and more information about it can be found here - http://www.parallels.com/products/server/baremetal/sp/. This driver will work with PVS version 6.0 , beta version scheduled at 2012 Q2. Dmitry Guryanov (9): pvs: add driver skeleton util: add functions for interating over json object pvs: add functions to list domains and get info pvs: implement functions for domain life cycle management pvs: get info about serial ports pvs: add support of VNC remote display pvs: implement virDomainDefineXML operation for existing domains pvs: add storage driver pvs: implement VM creation cfg.mk | 1 + configure.ac | 23 + docs/drvpvs.html.in | 28 + include/libvirt/virterror.h | 1 + libvirt.spec.in | 7 + mingw32-libvirt.spec.in | 6 + po/POTFILES.in | 1 + src/Makefile.am | 23 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 12 + src/pvs/pvs_driver.c | 1268 +++++++++++++++++++++++++++++++++++++ src/pvs/pvs_driver.h | 75 +++ src/pvs/pvs_storage.c | 1460 +++++++++++++++++++++++++++++++++++++++++++ src/pvs/pvs_utils.c | 139 ++++ src/util/json.c | 30 + src/util/json.h | 4 + src/util/virterror.c | 3 + 19 files changed, 3085 insertions(+), 1 deletions(-) create mode 100644 docs/drvpvs.html.in create mode 100644 src/pvs/pvs_driver.c create mode 100644 src/pvs/pvs_driver.h create mode 100644 src/pvs/pvs_storage.c create mode 100644 src/pvs/pvs_utils.c

2 13

[libvirt] CfP 7th Workshop on Virtualization in High-Performance Cloud Computing (VHPC'12)
by VHPC 11 18 Apr '12

18 Apr '12

we apologize if you receive multiple copies of this CFP. =================================================================== CALL FOR PAPERS 7th Workshop on Virtualization in High-Performance Cloud Computing VHPC '12 as part of Euro-Par 2012, Rhodes Island, Greece =================================================================== Date: August 28, 2012 Workshop URL: http://vhpc.org SUBMISSION DEADLINE: Rolling abstract submission June 4, 2012 - Full paper submission SCOPE: Virtualization has become a common abstraction layer in modern data centers, enabling resource owners to manage complex infrastructure independently of their applications. Conjointly, virtualization is becoming a driving technology for a manifold of industry grade IT services. The cloud concept includes the notion of a separation between resource owners and users, adding services such as hosted application frameworks and queueing. Utilizing the same infrastructure, clouds carry significant potential for use in high-performance scientific computing. The ability of clouds to provide for requests and releases of vast computing resources dynamically and close to the marginal cost of providing the services is unprecedented in the history of scientific and commercial computing. Distributed computing concepts that leverage federated resource access are popular within the grid community, but have not seen previously desired deployed levels so far. Also, many of the scientific data centers have not adopted virtualization or cloud concepts yet. This workshop aims to bring together industrial providers with the scientific community in order to foster discussion, collaboration and mutual exchange of knowledge and experience. The workshop will be one day in length, composed of 20 min paper presentations, each followed by 10 min discussion sections. Presentations may be accompanied by interactive demonstrations. TOPICS Topics of interest include, but are not limited to: Higher-level cloud architectures, focusing on issues such as: - Languages for describing highly-distributed compute jobs - Workload characterization for VM-based environments - Optimized communication libraries/protocols in the cloud - Cross-layer optimization of numeric algorithms on VM infrastructure - System and process/bytecode VM convergence - Cloud frameworks and API sets - Checkpointing/migration of large compute jobs - Instrumentation interfaces and languages - VMM performance (auto-)tuning on various load types - Cloud reliability, fault-tolerance, and security - Software as a Service (SaaS) architectures - Research and education use cases - Virtualization in cloud, cluster and grid environments - Cross-layer VM optimizations - Cloud use cases including optimizations - VM-based cloud performance modelling - Performance and cost modelling Lower-level design challenges for Hypervisors, VM-aware I/O devices, hardware accelerators or filesystems in VM environments, especially: - Cloud, grid and distributed filesystems - Hardware for I/O virtualization (storage/network/accelerators) - Storage and network I/O subsystems in virtualized environments - Novel software approaches to I/O virtualization - Paravirtualized I/O subsystems for modified/unmodified guests - Virtualization-aware cluster interconnects - Direct device assignment - NUMA-aware subsystems in virtualized environments - Hardware Accelerators in virtualization (GPUs/FPGAs) - Hardware extensions for virtualization - VMMs/Hypervisors for embedded systems Data Center management methods, including: - QoS and and service levels - VM cloud and cluster distribution algorithms - VM load-balancing in Clouds - Hypervisor extensions and tools for cluster and grid computing - Fault tolerant VM environments - Virtual machine monitor platforms - Management, deployment and monitoring of VM-based environments - Cluster provisioning in the Cloud PAPER SUBMISSION Papers submitted to the workshop will be reviewed by at least two members of the program committee and external reviewers. Submissions should include abstract, key words, the e-mail address of the corresponding author, and must not exceed 10 pages, including tables and figures at a main font size no smaller than 11 point. Submission of a paper should be regarded as a commitment that, should the paper be accepted, at least one of the authors will register and attend the conference to present the work. Accepted papers will be published in the Springer LNCS series - the format must be according to the Springer LNCS Style. Initial submissions are in PDF; authors of accepted papers will be requested to provide source files. Format Guidelines: http://www.springer.de/comp/lncs/authors.html Style template: ftp://ftp.springer.de/pub/tex/latex/llncs/latex2e/llncs2e.zip Abstract Submission Link: http://edas.info/newPaper.php?c=11943 IMPORTANT DATES Rolling abstract submission June 4, 2012 - Full paper submission June 29, 2012 - Acceptance notification July 20, 2012 - Camera-ready version due August 28, 2012 - Workshop Date CHAIR Michael Alexander (chair), TU Wien, Austria Gianluigi Zanetti (co-chair), CRS4, Italy Anastassios Nanos (co-chair), NTUA, Greece PROGRAM COMMITTEE Paolo Anedda, CRS4, Italy Giovanni Busonera, CRS4, Italy Brad Calder, Microsoft, USA Roberto Canonico, University of Napoli Federico II, Italy Tommaso Cucinotta, Scuola Superiore Sant'Anna, Italy Werner Fischer, Thomas-Krenn AG, Germany William Gardner, University of Guelph, USA Marcus Hardt, Forschungszentrum Karlsruhe, Germany Sverre Jarp, CERN, Switzerland Shantenu Jha, Louisiana State University, USA Xuxian Jiang, NC State, USA Nectarios Koziris, National Technical University of Athens, Greece Simone Leo, CRS4, Italy Ignacio Llorente, Universidad Complutense de Madrid, Spain Naoya Maruyama, Tokyo Institute of Technology, Japan Jean-Marc Menaud, Ecole des Mines de Nantes, France Dimitrios Nikolopoulos, Foundation for Research&Technology Hellas, Greece Jose Renato Santos, HP Labs, USA Walter Schwaiger, TU Wien, Austria Yoshio Turner, HP Labs, USA Kurt Tutschku, University of Vienna, Austria Lizhe Wang, Indiana University, USA Chao-Tung Yang, Tunghai University, Taiwan DURATION: Workshop Duration is one day. GENERAL INFORMATION The workshop will be held as part of Euro-Par 2012. Euro-Par 2012: http://europar2012.cti.gr/

1 0

[libvirt] [PATCH] util: only register callbacks for CREATE operations in virnetdevmacvlan.c
by D. Herrendoerfer 18 Apr '12

18 Apr '12

From: "D. Herrendoerfer" <d.herrendoerfer(a)herrendoerfer.name> currently upon a migration a callback is created when a 802.1qbg link is set to PREASSOCIATE, this should not happen because this is a no-op on most switches, and does not lead to an ASSOCIATE state. This patch only creates callbacks when CREATE is requested. Migration and libvirtd restart scenarios are already handeled elsewhere. Signed-off-by: D. Herrendoerfer <d.herrendoerfer(a)herrendoerfer.name> --- src/util/virnetdevmacvlan.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 17ea883..73f41ff 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -945,9 +945,12 @@ create_name: goto disassociate_exit; } - if (virNetDevMacVLanVPortProfileRegisterCallback(cr_ifname, macaddress, - linkdev, vmuuid, virtPortProfile, vmOp) < 0 ) + if (vmOp == VIR_NETDEV_VPORT_PROFILE_OP_CREATE) { + /*Only directly register upon a create - migration and restart are handled elsewhere*/ + if (virNetDevMacVLanVPortProfileRegisterCallback(cr_ifname, macaddress, + linkdev, vmuuid, virtPortProfile, vmOp) < 0 ) goto disassociate_exit; + } return rc; -- 1.7.7.6

3 6

[libvirt] [test-API 00/10] Reorgnize/refactoring round 2
by Osier Yang 18 Apr '12

18 Apr '12

This should be the second round to reorgnize/refactor the codes. What this round does: * New directory "conf"; Move $root/*.cfg into it * New directory "src"; Move $root/*.{py,css,xls} into it (except the main program libvirt-test-api.py) * Rename libvirt-test-api.py to libvirt-test-api * Move install-autotest-server into "scripts" * Rename BUGSKIP to SKIP, and modify the skipping syntax so that it skips whole test case, but not test step(s). See the explaination in the patch to get why to do it. * Destroy the codes to skip test steps. * Other small fixes. TODO in next round: * Support run all cases in a bundle * Support to skip test case with the new skipping syntax * A new config property for the scratch directory, (now it always use $(pwd)/$guest_name to download the files, we should have something like '/var/cache/libvirt-test-API' instead). * Other cleaning up. Osier Yang (10): Create new dir 'conf' and move conf files into it Fix the typo in usage string Remove the suffix .py for libvirt-test-api.py New directory 'src' and move *.{py,css,xls} files into it Fix the typo which mispells 'shutil' as 'shutils' Move install-autotest-server into 'scripts' Update logging stuffs so that it works after source tree reorgnizing Add document to tell the default log output file Rename and modify the syntax of BUGSKIP Destroy the codes to skip case steps. BUGSKIP | 4 - SKIP | 26 ++++++++ env.cfg => conf/env.cfg | 0 kickstart.cfg => conf/kickstart.cfg | 0 dist/redhat/env_inspect.py | 2 +- libvirt-test-api.py => libvirt-test-api | 50 ++++++++-------- repos/domain/attach_disk.py | 2 +- repos/domain/attach_interface.py | 2 +- repos/domain/autostart.py | 2 +- repos/domain/balloon_memory.py | 2 +- repos/domain/blkstats.py | 2 +- repos/domain/console_io.py | 2 +- repos/domain/console_mutex.py | 2 +- repos/domain/cpu_affinity.py | 2 +- repos/domain/cpu_topology.py | 2 +- repos/domain/create.py | 2 +- repos/domain/define.py | 2 +- repos/domain/destroy.py | 2 +- repos/domain/detach_disk.py | 2 +- repos/domain/detach_interface.py | 2 +- repos/domain/domain_blkinfo.py | 2 +- repos/domain/domain_id.py | 2 +- repos/domain/domblkinfo.py | 2 +- repos/domain/dump.py | 2 +- repos/domain/eventhandler.py | 2 +- repos/domain/ifstats.py | 2 +- repos/domain/install_image.py | 4 +- repos/domain/install_linux_cdrom.py | 10 ++-- repos/domain/install_linux_check.py | 4 +- repos/domain/install_linux_net.py | 12 ++-- repos/domain/install_windows_cdrom.py | 12 ++-- repos/domain/migrate.py | 2 +- repos/domain/ownership_test.py | 2 +- repos/domain/reboot.py | 2 +- repos/domain/restore.py | 2 +- repos/domain/resume.py | 2 +- repos/domain/save.py | 2 +- repos/domain/sched_params.py | 2 +- repos/domain/shutdown.py | 2 +- repos/domain/start.py | 2 +- repos/domain/suspend.py | 2 +- repos/domain/undefine.py | 2 +- repos/domain/update_devflag.py | 2 +- repos/interface/create.py | 2 +- repos/interface/define.py | 2 +- repos/interface/destroy.py | 2 +- repos/interface/undefine.py | 2 +- repos/libvirtd/qemu_hang.py | 2 +- repos/libvirtd/restart.py | 2 +- repos/network/autostart.py | 2 +- repos/network/create.py | 2 +- repos/network/define.py | 2 +- repos/network/destroy.py | 2 +- repos/network/network_list.py | 2 +- repos/network/network_name.py | 2 +- repos/network/network_uuid.py | 2 +- repos/network/start.py | 2 +- repos/network/undefine.py | 2 +- repos/nodedevice/detach.py | 2 +- repos/nodedevice/reattach.py | 2 +- repos/nodedevice/reset.py | 2 +- repos/npiv/create_virtual_hba.py | 2 +- .../multiple_thread_block_on_domain_create.py | 4 +- repos/remoteAccess/tcp_setup.py | 2 +- repos/remoteAccess/tls_setup.py | 8 +- repos/sVirt/domain_nfs_start.py | 2 +- repos/snapshot/delete.py | 2 +- repos/snapshot/file_flag.py | 2 +- repos/snapshot/flag_check.py | 2 +- repos/snapshot/internal_create.py | 2 +- repos/snapshot/revert.py | 2 +- repos/storage/activate_pool.py | 2 +- repos/storage/build_dir_pool.py | 2 +- repos/storage/build_disk_pool.py | 2 +- repos/storage/build_logical_pool.py | 2 +- repos/storage/build_netfs_pool.py | 2 +- repos/storage/create_dir_pool.py | 2 +- repos/storage/create_dir_volume.py | 2 +- repos/storage/create_fs_pool.py | 2 +- repos/storage/create_iscsi_pool.py | 2 +- repos/storage/create_logical_volume.py | 2 +- repos/storage/create_netfs_pool.py | 2 +- repos/storage/create_netfs_volume.py | 2 +- repos/storage/create_partition_volume.py | 2 +- repos/storage/define_dir_pool.py | 2 +- repos/storage/define_disk_pool.py | 2 +- repos/storage/define_iscsi_pool.py | 2 +- repos/storage/define_logical_pool.py | 2 +- repos/storage/define_mpath_pool.py | 2 +- repos/storage/define_netfs_pool.py | 2 +- repos/storage/define_scsi_pool.py | 2 +- repos/storage/delete_dir_volume.py | 2 +- repos/storage/delete_logical_pool.py | 2 +- repos/storage/delete_logical_volume.py | 2 +- repos/storage/delete_netfs_volume.py | 2 +- repos/storage/delete_partition_volume.py | 2 +- repos/storage/destroy_pool.py | 2 +- repos/storage/pool_name.py | 2 +- repos/storage/pool_uuid.py | 2 +- repos/storage/undefine_pool.py | 2 +- .../install-autotest-server | 0 activityfilter.py => src/activityfilter.py | 0 casecfgcheck.py => src/casecfgcheck.py | 2 +- env_clear.py => src/env_clear.py | 2 +- exception.py => src/exception.py | 2 +- generator.py => src/generator.py | 61 ++++---------------- log.css => src/log.css | 0 log.xsl => src/log.xsl | 2 +- logxmlparser.py => src/logxmlparser.py | 4 +- mapper.py => src/mapper.py | 0 parser.py => src/parser.py | 6 +- process.py => src/process.py | 0 proxy.py => src/proxy.py | 2 +- sharedmod.py => src/sharedmod.py | 0 utils/env_parser.py | 2 +- 115 files changed, 188 insertions(+), 205 deletions(-) delete mode 100644 BUGSKIP create mode 100644 SKIP rename env.cfg => conf/env.cfg (100%) rename kickstart.cfg => conf/kickstart.cfg (100%) rename libvirt-test-api.py => libvirt-test-api (91%) rename install-autotest-server => scripts/install-autotest-server (100%) create mode 100644 src/__init__.py rename activityfilter.py => src/activityfilter.py (100%) rename casecfgcheck.py => src/casecfgcheck.py (99%) rename env_clear.py => src/env_clear.py (99%) rename exception.py => src/exception.py (97%) rename generator.py => src/generator.py (78%) rename log.css => src/log.css (100%) rename log.xsl => src/log.xsl (98%) rename logxmlparser.py => src/logxmlparser.py (99%) rename mapper.py => src/mapper.py (100%) rename parser.py => src/parser.py (99%) rename process.py => src/process.py (100%) rename proxy.py => src/proxy.py (99%) rename sharedmod.py => src/sharedmod.py (100%) Regards, Osier -- 1.7.7.3

2 22

[libvirt] VN-Link vNIC memory state copying on VM Migration
by Jagath Weerasinghe 18 Apr '12

18 Apr '12

Hi All, I am new to libvirt. And want to know how the VM migration occurs in VN-Link (IEEE802.1Qbh). As far as I know, the memory state of vNICs in M81KR VIC has to be copied and moved to the destination vNIC on VM migration. Is that correct? If so, could you please tell me how this has been implemented in libvirt? Thanks Jagath

2 8

[libvirt] Incomplete stdout returned by qemu -help cause kvm disabled
by 杨镭 18 Apr '12

18 Apr '12

Hi: In our setup(libvirt 0.9.9 with Arch Linux with kernel 3.2+), when libvirt are accessed simultaneously, say 8 createDomain requests, there is a large chance that `qemu -help` return incomplete stdout which cause kvm to be disabled. Another user have the same situation like us[1] and he suspected this being the result of some race conditions. 1: https://www.redhat.com/archives/libvir-list/2012-April/msg00380.html -- lei yang

2 1

[libvirt] [PATCH] Remove the useless scripts directory and script under it
by Osier Yang 18 Apr '12

18 Apr '12

The script is useful only if all the scripts have good document comments. Unfortunately, it's not true, and it's burden for developers to write those documents in specific format somehow, on the other hand, because we introduced required_opts, optional_opts for each cases to generate the usage strings, and new option "-t" to print template for cases, it's no need to write documents in specific format for scripts now. --- scripts/gen_case_doc.sh | 21 --------------------- 1 files changed, 0 insertions(+), 21 deletions(-) delete mode 100644 scripts/gen_case_doc.sh diff --git a/scripts/gen_case_doc.sh b/scripts/gen_case_doc.sh deleted file mode 100644 index e814532..0000000 --- a/scripts/gen_case_doc.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh -# Create documentation of cases in Python - -FILES=`find $PWD/repos/Python -type f -name "*.py"` - -for i in ${FILES}; do - if [ $(basename $i) != '__init__.py' ]; then - DIRNAME=$(dirname $i) - DIRNAME=$(echo $DIRNAME | sed -e 's:repos:doc:g') - fi - - if ! [ -e $DIRNAME ]; then - mkdir -p $DIRNAME - fi - - cd $DIRNAME - pydoc -w $i - cd - -done - -exit $? -- 1.7.7.3

2 5

[libvirt] [test-API] Delete the script to generate the testing coverage statistics
by Osier Yang 18 Apr '12

18 Apr '12

lib/*.py were destroyed. And there is no way to count the API coverage now. --- I tried to write a rough patch to generate the statistics, but failed. There is no way to detect if the API is covered by the cases, because the different class can have same methods name, though I can filter out the APIs for each libvirt object by: libvirt_module="/usr/lib64/python2.7/site-packages/libvirt.py" declare -a arr=($(grep -E "class vir[A-Za-z]+:" $libvirt_module | \ cut -d' ' -f2)) for i in $(seq 0 $((${#arr[@]} - 1))); do j=$(($i + 1)) echo "[ == ${arr[$i]} == ]" if [ $j -lt ${#arr[@]} ]; then sed -n -e "/${arr[$i]}/,/${arr[$j]}/{/${arr[$j]}/!p}" \ $libvirt_module | grep '^ def ' | grep -E -v "__del|__init" | \ sed -e "s/\s*def //g" -e "s/(.*)://g" fi done --- utils/stats.sh | 72 -------------------------------------------------------- 1 files changed, 0 insertions(+), 72 deletions(-) delete mode 100755 utils/stats.sh diff --git a/utils/stats.sh b/utils/stats.sh deleted file mode 100755 index cf2765b..0000000 --- a/utils/stats.sh +++ /dev/null @@ -1,72 +0,0 @@ -#! /bin/bash - -if [ ! -d $(pwd)/coverage ]; then - mkdir -p $(pwd)/coverage -fi - -VIRT_STATS_FILE="$(pwd)/coverage/libvirt_API_statistics.txt" -PYTHON="python$(python -V 2>&1|cut -c 8-10)" -SUMMARY="coverage/coverage.txt" - -if [ $(uname -p) = "x86_64" ]; then - export LIB="lib64" -else - export LIB="lib" -fi - -function delimiter() -{ - local i=1 - local separator=$1 - local line='' - while [ $i -le $2 ] - do - line=${line}${separator} - i=$((i+1)) - done - echo "+$line+" | tee -a $SUMMARY -} - -echo -echo "Generate Libvirt API Statistics Report under the " -echo "$(pwd)/coverage" -echo -delimiter '=' 50 -echo -e "| Libvirt API statistics of coverage\t |" | tee -a $SUMMARY -echo -e "| $(date +'%F %T') ($(whoami))\t\t |" | tee -a $SUMMARY -delimiter '=' 50 - -VIRT_PATH="/usr/$LIB/$PYTHON/site-packages/libvirt.py" -grep 'def ' $VIRT_PATH|grep -v "#"|grep -v "__init__" |grep -v "__del__"|cut -d"(" -f 1 |awk '{print NR, $2}' > $VIRT_STATS_FILE - -TOTAL_API_NUM=$(grep 'def ' $VIRT_PATH|grep -v "#"|grep -v "__init__" |grep -v "__del__"|wc -l) -WRAPPER_API_PATH="$(pwd)/lib/Python" -WRAPPER_API_NUM=0 - -for wrapper in connect domain network storage nodedev interface secret nwfilter -do - export EVERY_API_NUM=$(grep 'def ' $WRAPPER_API_PATH/$wrapper'API.py'|grep -v '#'|grep -v '__init__' |grep -v '__del__r'|wc -l) - API_NUM=${EVERY_API_NUM} - let WRAPPER_API_NUM=$WRAPPER_API_NUM+$API_NUM - echo -e "| cover $wrapper API number\t|\t$API_NUM\t |" | tee -a $SUMMARY - if [ $wrapper != "nwfilter" ]; then - delimiter '-' 50 - else - continue - fi -done - -delimiter '=' 50 -echo -e "| cover libvirt API total number|\t$WRAPPER_API_NUM\t |" | tee -a $SUMMARY -delimiter '-' 50 - -echo -e "| libvirt API real total number\t|\t$TOTAL_API_NUM\t |" | tee -a $SUMMARY -delimiter '=' 50 - -RATE=$(printf "%.0f%%" `echo "scale=2;$WRAPPER_API_NUM/$TOTAL_API_NUM*100"|bc`) -echo -e "| libvirt API coverage rate\t|\t$RATE\t |" | tee -a $SUMMARY -delimiter '=' 50 - -echo | tee -a $SUMMARY - - -- 1.7.7.3

2 2

[libvirt] [test-API 0/3] Destroy class for utils/check.py
by Osier Yang 18 Apr '12

18 Apr '12

Just as what we did for utils/utils.py, we don't benifit from the class use at all. Osier Yang (3): remove importing of unused check module Destroy class of utils/check.py Destroy use of check class repos/domain/balloon_memory.py | 3 +- repos/domain/dump.py | 4 +- repos/domain/install_linux_check.py | 15 +- repos/snapshot/file_flag.py | 7 +- repos/snapshot/flag_check.py | 3 +- utils/check.py | 649 +++++++++++++++++------------------ utils/xmlgenerator.py | 1 - 7 files changed, 335 insertions(+), 347 deletions(-) -- 1.7.7.3

2 6

[libvirt] [test-API] Improve the comments telling what the scripts does for utils/*.py
by Osier Yang 18 Apr '12

18 Apr '12

It's a habit to comment on the top of program to tell what the program does, and actually it's what GNU suggests: <quote> <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> </quote> --- utils/XMLParser.py | 4 ++-- utils/check.py | 7 ++----- utils/env_parser.py | 6 ++---- utils/format.py | 6 ++---- utils/log.py | 6 ++---- utils/xmlbuilder.py | 6 ++---- utils/xmlgenerator.py | 6 ++---- 7 files changed, 14 insertions(+), 27 deletions(-) diff --git a/utils/XMLParser.py b/utils/XMLParser.py index b254023..4d7fc72 100644 --- a/utils/XMLParser.py +++ b/utils/XMLParser.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# XMLParser.py: Parse XML document, the result is a python dict. + # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -17,8 +19,6 @@ # # Filename: XMLParser.py # Summary: parse and xml document into a python dictionary -# Description: The module is a tool to parses -# and xml document into a python dictionary import os from xml.dom import minidom diff --git a/utils/check.py b/utils/check.py index 1db49e7..7f35418 100644 --- a/utils/check.py +++ b/utils/check.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# check.py: Check methods for cases. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,11 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: check.py -# Summary: basic check operation needed by test -# Description: The module is a tool to help conduct basic -# check operation on specified host import os import re diff --git a/utils/env_parser.py b/utils/env_parser.py index 6e49e50..e756a38 100644 --- a/utils/env_parser.py +++ b/utils/env_parser.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# env_parser.py: Parser for environment config (env.cfg). +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: env_parser.py -# Summary: parse the env configuration file -# Description: The module is a tool to parse the env configuration file import ConfigParser import os diff --git a/utils/format.py b/utils/format.py index b72c987..2a35664 100644 --- a/utils/format.py +++ b/utils/format.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# format.py: Print logging message in specific format. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: format.py -# Summary: generate specified kind of format string -# Description: The module is a tool to generate specified kind of format string import os from string import Template diff --git a/utils/log.py b/utils/log.py index 3ca8729..4111fd9 100644 --- a/utils/log.py +++ b/utils/log.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# log.py: Classes for logging. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: log.py -# Summary: log file operation -# Description: The module is a tool to provide basic log file operation import time import os diff --git a/utils/xmlbuilder.py b/utils/xmlbuilder.py index a8a9871..d2ce6bb 100644 --- a/utils/xmlbuilder.py +++ b/utils/xmlbuilder.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# xmlbuilder.py: Class for building XML for libvirt objects. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: xmlbuilder.py -# Summary: operation for building domain xml -# Description: The module is to provide operation for building domain xml __DEBUG__ = False diff --git a/utils/xmlgenerator.py b/utils/xmlgenerator.py index 7f5839b..ee019b7 100644 --- a/utils/xmlgenerator.py +++ b/utils/xmlgenerator.py @@ -1,5 +1,7 @@ #!/usr/bin/env python # +# xmlgenerator.py: Generate XML for libvirt objects. +# # Copyright (C) 2010-2012 Red Hat, Inc. # # libvirt-test-API is free software; you can redistribute it and/or @@ -14,10 +16,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Filename: xmlgenerator.py -# Summary: generate domain xml -# Description: The module is a tool to generate domain xml import os import sys -- 1.7.7.3

2 1

[libvirt] [PATCH 1/2] python: cleanup vcpu related binding APIs
by Guannan Ren 18 Apr '12

18 Apr '12

*libvirt_virDomainGetVcpus: add error handling, return -1 instead of None *libvirt_virDomainPinVcpu and libvirt_virDomainPinVcpuFlags: make use of libvirt_boolUnwrap set vcpus which are list in tuple pycpumap, trun off the rest in cpumap. The original way ignored the error info from PyTuple_GetItem if pos is out of bounds. "IndexError: tuple index out of range" The error message will only be raised on next command in interactive mode. --- python/libvirt-override.c | 173 +++++++++++++++++++++++++++++--------------- 1 files changed, 114 insertions(+), 59 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 56f96ba..2788546 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1333,9 +1333,11 @@ cleanup: static PyObject * libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; PyObject *pyobj_domain, *pyretval = NULL, *pycpuinfo = NULL, *pycpumap = NULL; + PyObject *error = NULL; virNodeInfo nodeinfo; virDomainInfo dominfo; virVcpuInfoPtr cpuinfo = NULL; @@ -1352,29 +1354,33 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, i_retval = virNodeGetInfo(virDomainGetConnect(domain), &nodeinfo); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) - return VIR_PY_NONE; + return VIR_PY_INT_FAIL; LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetInfo(domain, &dominfo); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) - return VIR_PY_NONE; + return VIR_PY_INT_FAIL; if (VIR_ALLOC_N(cpuinfo, dominfo.nrVirtCpu) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); if (xalloc_oversized(dominfo.nrVirtCpu, cpumaplen) || - VIR_ALLOC_N(cpumap, dominfo.nrVirtCpu * cpumaplen) < 0) + VIR_ALLOC_N(cpumap, dominfo.nrVirtCpu * cpumaplen) < 0) { + error = PyErr_NoMemory(); goto cleanup; + } LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetVcpus(domain, cpuinfo, dominfo.nrVirtCpu, cpumap, cpumaplen); LIBVIRT_END_ALLOW_THREADS; - if (i_retval < 0) + if (i_retval < 0) { + error = VIR_PY_INT_FAIL; goto cleanup; + } /* convert to a Python tuple of long objects */ if ((pyretval = PyTuple_New(2)) == NULL) @@ -1388,54 +1394,80 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, PyObject *info = PyTuple_New(4); if (info == NULL) goto cleanup; - PyTuple_SetItem(info, 0, PyInt_FromLong((long)cpuinfo[i].number)); - PyTuple_SetItem(info, 1, PyInt_FromLong((long)cpuinfo[i].state)); - PyTuple_SetItem(info, 2, PyLong_FromLongLong((long long)cpuinfo[i].cpuTime)); - PyTuple_SetItem(info, 3, PyInt_FromLong((long)cpuinfo[i].cpu)); - PyList_SetItem(pycpuinfo, i, info); + if (PyTuple_SetItem(info, 0, PyInt_FromLong((long)cpuinfo[i].number)) < 0) + { + Py_DECREF(info); + goto cleanup; + } + + if (PyTuple_SetItem(info, 1, PyInt_FromLong((long)cpuinfo[i].state)) < 0) + { + Py_DECREF(info); + goto cleanup; + } + + if (PyTuple_SetItem(info, 2, PyLong_FromLongLong((long long)cpuinfo[i].cpuTime)) < 0) + { + Py_DECREF(info); + goto cleanup; + } + + if (PyTuple_SetItem(info, 3, PyInt_FromLong((long)cpuinfo[i].cpu)) < 0) + { + Py_DECREF(info); + goto cleanup; + } + if (PyList_SetItem(pycpuinfo, i, info) < 0) + goto cleanup; } + for (i = 0 ; i < dominfo.nrVirtCpu ; i++) { PyObject *info = PyTuple_New(VIR_NODEINFO_MAXCPUS(nodeinfo)); - int j; if (info == NULL) goto cleanup; + + int j; for (j = 0 ; j < VIR_NODEINFO_MAXCPUS(nodeinfo) ; j++) { - PyTuple_SetItem(info, j, PyBool_FromLong(VIR_CPU_USABLE(cpumap, cpumaplen, i, j))); + if (PyTuple_SetItem(info, j, PyBool_FromLong(VIR_CPU_USABLE(cpumap, cpumaplen, i, j))) < 0) + { + Py_DECREF(info); + goto cleanup; + } } - PyList_SetItem(pycpumap, i, info); + if (PyList_SetItem(pycpumap, i, info) < 0) + goto cleanup; } - PyTuple_SetItem(pyretval, 0, pycpuinfo); - PyTuple_SetItem(pyretval, 1, pycpumap); + + if (PyTuple_SetItem(pyretval, 0, pycpuinfo) < 0) + goto cleanup; + + if (PyTuple_SetItem(pyretval, 1, pycpumap) < 0) + goto cleanup; VIR_FREE(cpuinfo); VIR_FREE(cpumap); return pyretval; - cleanup: +cleanup: VIR_FREE(cpuinfo); VIR_FREE(cpumap); - /* NB, Py_DECREF is a badly defined macro, so we require - * braces here to avoid 'ambiguous else' warnings from - * the compiler. - * NB. this comment is true at of time of writing wrt to - * at least python2.5. - */ - if (pyretval) { Py_DECREF(pyretval); } - if (pycpuinfo) { Py_DECREF(pycpuinfo); } - if (pycpumap) { Py_DECREF(pycpumap); } - return VIR_PY_NONE; + Py_XDECREF(pyretval); + Py_XDECREF(pycpuinfo); + Py_XDECREF(pycpumap); + return error; } - static PyObject * libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; - PyObject *pyobj_domain, *pycpumap, *truth; + PyObject *pyobj_domain, *pycpumap; + PyObject *ret = NULL; virNodeInfo nodeinfo; unsigned char *cpumap; - int cpumaplen, i, vcpu; + int cpumaplen, i, j, vcpu, tuple_size; int i_retval; if (!PyArg_ParseTuple(args, (char *)"OiO:virDomainPinVcpu", @@ -1451,37 +1483,50 @@ libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED, cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); if (VIR_ALLOC_N(cpumap, cpumaplen) < 0) - return VIR_PY_INT_FAIL; + return PyErr_NoMemory(); - truth = PyBool_FromLong(1); - for (i = 0 ; i < VIR_NODEINFO_MAXCPUS(nodeinfo) ; i++) { + tuple_size = PyTuple_Size(pycpumap); + if (tuple_size == -1) + goto cleanup; + + for (i = 0; i < tuple_size; i++) { PyObject *flag = PyTuple_GetItem(pycpumap, i); - if (flag == truth) - VIR_USE_CPU(cpumap, i); - else - VIR_UNUSE_CPU(cpumap, i); + bool b; + + if ((!flag) || (libvirt_boolUnwrap(flag, &b) < 0)) + goto cleanup; + + (b) ? VIR_USE_CPU(cpumap, i) : VIR_UNUSE_CPU(cpumap, i); } + for (j = 0; j < VIR_NODEINFO_MAXCPUS(nodeinfo) - i; j++) + VIR_UNUSE_CPU(cpumap, i + j); + LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainPinVcpu(domain, vcpu, cpumap, cpumaplen); LIBVIRT_END_ALLOW_THREADS; - Py_DECREF(truth); - VIR_FREE(cpumap); - if (i_retval < 0) - return VIR_PY_INT_FAIL; + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + ret = VIR_PY_INT_SUCCESS; - return VIR_PY_INT_SUCCESS; +cleanup: + VIR_FREE(cpumap); + return ret; } static PyObject * libvirt_virDomainPinVcpuFlags(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; - PyObject *pyobj_domain, *pycpumap, *truth; + PyObject *pyobj_domain, *pycpumap; + PyObject *ret = NULL; virNodeInfo nodeinfo; unsigned char *cpumap; - int cpumaplen, i, vcpu; + int cpumaplen, i, j, vcpu, tuple_size; unsigned int flags; int i_retval; @@ -1498,27 +1543,37 @@ libvirt_virDomainPinVcpuFlags(PyObject *self ATTRIBUTE_UNUSED, cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); if (VIR_ALLOC_N(cpumap, cpumaplen) < 0) - return VIR_PY_INT_FAIL; + return PyErr_NoMemory(); + + tuple_size = PyTuple_Size(pycpumap); + if (tuple_size == -1) + goto cleanup; - truth = PyBool_FromLong(1); - for (i = 0 ; i < VIR_NODEINFO_MAXCPUS(nodeinfo) ; i++) { + for (i = 0; i < tuple_size; i++) { PyObject *flag = PyTuple_GetItem(pycpumap, i); - if (flag == truth) - VIR_USE_CPU(cpumap, i); - else - VIR_UNUSE_CPU(cpumap, i); + bool b; + + if ((!flag) || (libvirt_boolUnwrap(flag, &b) < 0)) + goto cleanup; + + (b) ? VIR_USE_CPU(cpumap, i) : VIR_UNUSE_CPU(cpumap, i); } + for (j = 0; j < VIR_NODEINFO_MAXCPUS(nodeinfo) - i; j++) + VIR_UNUSE_CPU(cpumap, i + j); + LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainPinVcpuFlags(domain, vcpu, cpumap, cpumaplen, flags); LIBVIRT_END_ALLOW_THREADS; - Py_DECREF(truth); - VIR_FREE(cpumap); - - if (i_retval < 0) - return VIR_PY_INT_FAIL; + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + ret = VIR_PY_INT_SUCCESS; - return VIR_PY_INT_SUCCESS; +cleanup: + VIR_FREE(cpumap); + return ret; } static PyObject * -- 1.7.7.5

2 5

[libvirt] [test-API 0/3] Improve the copyright statements in scripts
by Osier Yang 18 Apr '12

18 Apr '12

The new copyright statements is: Copyright (C) 2010-2012 Red Hat, Inc. libvirt-test-API is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranties of TITLE, NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Osier Yang (3): Remove the unseemly copyright statements in scripts Add the better copyright statements in scripts Remove the redundant empty comment line activityfilter.py | 23 ++++++++++++----------- casecfgcheck.py | 22 ++++++++++++---------- dist/redhat/env_inspect.py | 24 +++++++++++++----------- env_clear.py | 24 +++++++++++++----------- exception.py | 23 +++++++++++++---------- generator.py | 24 +++++++++++++----------- libvirt-test-api.py | 22 ++++++++++++---------- logxmlparser.py | 23 +++++++++++++---------- mapper.py | 24 +++++++++++++----------- parser.py | 24 +++++++++++++----------- process.py | 23 +++++++++++++---------- proxy.py | 25 ++++++++++++++----------- utils/XMLParser.py | 23 +++++++++++++---------- utils/check.py | 23 +++++++++++++---------- utils/env_parser.py | 23 +++++++++++++---------- utils/format.py | 23 +++++++++++++---------- utils/log.py | 23 +++++++++++++---------- utils/utils.py | 22 ++++++++++++---------- utils/xmlbuilder.py | 23 +++++++++++++---------- utils/xmlgenerator.py | 23 +++++++++++++---------- 20 files changed, 257 insertions(+), 207 deletions(-) Regards, Osier -- 1.7.7.3

3 19

[libvirt] [test-API] Add one space between shebang and following interpreter
by Osier Yang 18 Apr '12

18 Apr '12

We want it looks better. Isn't it? :-) --- activityfilter.py | 2 +- casecfgcheck.py | 2 +- dist/redhat/env_inspect.py | 2 +- env_clear.py | 2 +- exception.py | 2 +- generator.py | 2 +- libvirt-test-api.py | 2 +- logxmlparser.py | 2 +- mapper.py | 2 +- parser.py | 2 +- process.py | 2 +- proxy.py | 2 +- repos/domain/attach_disk.py | 2 +- repos/domain/attach_interface.py | 2 +- repos/domain/balloon_memory.py | 2 +- repos/domain/console_io.py | 2 +- repos/domain/console_mutex.py | 2 +- repos/domain/cpu_affinity.py | 2 +- repos/domain/cpu_topology.py | 2 +- repos/domain/create.py | 2 +- repos/domain/destroy.py | 2 +- repos/domain/detach_disk.py | 2 +- repos/domain/detach_interface.py | 2 +- repos/domain/domain_blkinfo.py | 2 +- repos/domain/domain_id.py | 2 +- repos/domain/domain_list.py | 2 +- repos/domain/domain_name.py | 2 +- repos/domain/domain_uuid.py | 2 +- repos/domain/domblkinfo.py | 2 +- repos/domain/dump.py | 2 +- repos/domain/eventhandler.py | 2 +- repos/domain/hostname.py | 2 +- repos/domain/install_image.py | 2 +- repos/domain/install_linux_cdrom.py | 2 +- repos/domain/install_linux_check.py | 2 +- repos/domain/install_windows_cdrom.py | 2 +- repos/domain/migrate.py | 2 +- repos/domain/ownership_test.py | 2 +- repos/domain/reboot.py | 2 +- repos/domain/restore.py | 2 +- repos/domain/resume.py | 2 +- repos/domain/save.py | 2 +- repos/domain/screenshot.py | 2 +- repos/domain/shutdown.py | 2 +- repos/domain/start.py | 2 +- repos/domain/suspend.py | 2 +- repos/domain/update_devflag.py | 2 +- repos/interface/create.py | 2 +- repos/interface/define.py | 2 +- repos/interface/destroy.py | 2 +- repos/interface/iface_list.py | 2 +- repos/interface/iface_mac.py | 2 +- repos/interface/iface_name.py | 2 +- repos/interface/undefine.py | 2 +- repos/libvirtd/qemu_hang.py | 2 +- repos/libvirtd/upstart.py | 2 +- repos/network/network_list.py | 2 +- repos/network/network_name.py | 2 +- repos/network/network_uuid.py | 2 +- repos/nodedevice/detach.py | 2 +- repos/nodedevice/reattach.py | 2 +- repos/nodedevice/reset.py | 2 +- repos/npiv/create_virtual_hba.py | 2 +- .../multiple_thread_block_on_domain_create.py | 2 +- repos/remoteAccess/tcp_setup.py | 2 +- repos/remoteAccess/tls_setup.py | 2 +- repos/remoteAccess/unix_perm_sasl.py | 2 +- repos/sVirt/domain_nfs_start.py | 2 +- repos/snapshot/delete.py | 2 +- repos/snapshot/file_flag.py | 2 +- repos/snapshot/flag_check.py | 2 +- repos/snapshot/internal_create.py | 2 +- repos/snapshot/revert.py | 2 +- repos/snapshot/snapshot_list.py | 2 +- repos/storage/activate_pool.py | 2 +- repos/storage/build_dir_pool.py | 2 +- repos/storage/build_disk_pool.py | 2 +- repos/storage/build_logical_pool.py | 2 +- repos/storage/build_netfs_pool.py | 2 +- repos/storage/create_dir_pool.py | 2 +- repos/storage/create_dir_volume.py | 2 +- repos/storage/create_fs_pool.py | 2 +- repos/storage/create_iscsi_pool.py | 2 +- repos/storage/create_logical_volume.py | 2 +- repos/storage/create_netfs_pool.py | 2 +- repos/storage/create_netfs_volume.py | 2 +- repos/storage/create_partition_volume.py | 2 +- repos/storage/define_dir_pool.py | 2 +- repos/storage/define_disk_pool.py | 2 +- repos/storage/define_iscsi_pool.py | 2 +- repos/storage/define_logical_pool.py | 2 +- repos/storage/define_mpath_pool.py | 2 +- repos/storage/define_netfs_pool.py | 2 +- repos/storage/define_scsi_pool.py | 2 +- repos/storage/delete_dir_volume.py | 2 +- repos/storage/delete_logical_pool.py | 2 +- repos/storage/delete_logical_volume.py | 2 +- repos/storage/delete_netfs_volume.py | 2 +- repos/storage/delete_partition_volume.py | 2 +- repos/storage/destroy_pool.py | 2 +- repos/storage/pool_name.py | 2 +- repos/storage/pool_uuid.py | 2 +- repos/storage/undefine_pool.py | 2 +- utils/XMLParser.py | 2 +- utils/check.py | 2 +- utils/dev_num.sh | 2 +- utils/disk_num.sh | 2 +- utils/env_parser.py | 2 +- utils/format.py | 2 +- utils/ipget.sh | 2 +- utils/ksiso.sh | 2 +- utils/log.py | 2 +- utils/stats.sh | 2 +- utils/utils.py | 2 +- utils/xmlbuilder.py | 2 +- utils/xmlgenerator.py | 2 +- 116 files changed, 116 insertions(+), 116 deletions(-) diff --git a/activityfilter.py b/activityfilter.py index 1326948..4c26fbd 100644 --- a/activityfilter.py +++ b/activityfilter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/casecfgcheck.py b/casecfgcheck.py index 5e513e1..125b4c9 100644 --- a/casecfgcheck.py +++ b/casecfgcheck.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/dist/redhat/env_inspect.py b/dist/redhat/env_inspect.py index b9b8ed0..6ec13b0 100644 --- a/dist/redhat/env_inspect.py +++ b/dist/redhat/env_inspect.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/env_clear.py b/env_clear.py index ed862db..cdc4930 100644 --- a/env_clear.py +++ b/env_clear.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/exception.py b/exception.py index 3625dab..6a3062f 100644 --- a/exception.py +++ b/exception.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/generator.py b/generator.py index 53febde..ac41aca 100644 --- a/generator.py +++ b/generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/libvirt-test-api.py b/libvirt-test-api.py index b7b2b74..c2db19c 100644 --- a/libvirt-test-api.py +++ b/libvirt-test-api.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/logxmlparser.py b/logxmlparser.py index ed45594..8521079 100644 --- a/logxmlparser.py +++ b/logxmlparser.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/mapper.py b/mapper.py index f09e569..af02f95 100644 --- a/mapper.py +++ b/mapper.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/parser.py b/parser.py index b0bad3b..b82cc49 100644 --- a/parser.py +++ b/parser.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/process.py b/process.py index 0edc9ae..34a7948 100644 --- a/process.py +++ b/process.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/proxy.py b/proxy.py index 7e81319..17ed180 100644 --- a/proxy.py +++ b/proxy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/repos/domain/attach_disk.py b/repos/domain/attach_disk.py index 9d8426d..d920233 100644 --- a/repos/domain/attach_disk.py +++ b/repos/domain/attach_disk.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Attach a disk device to domain import os diff --git a/repos/domain/attach_interface.py b/repos/domain/attach_interface.py index 1d0cb3c..0e91939 100644 --- a/repos/domain/attach_interface.py +++ b/repos/domain/attach_interface.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Attach interface to domain import os diff --git a/repos/domain/balloon_memory.py b/repos/domain/balloon_memory.py index de18b87..48dbaa6 100644 --- a/repos/domain/balloon_memory.py +++ b/repos/domain/balloon_memory.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test domain memory ballooning import os diff --git a/repos/domain/console_io.py b/repos/domain/console_io.py index c44f5b4..0479532 100644 --- a/repos/domain/console_io.py +++ b/repos/domain/console_io.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # test console interactions # This test sends contents of file 'input' to the guest's console # and reads from the console the reply and compares it to 'expect' or diff --git a/repos/domain/console_mutex.py b/repos/domain/console_mutex.py index c67aec6..3bb50f5 100644 --- a/repos/domain/console_mutex.py +++ b/repos/domain/console_mutex.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test console mutual exclusivity import libvirt diff --git a/repos/domain/cpu_affinity.py b/repos/domain/cpu_affinity.py index 1332c7e..3e335af 100644 --- a/repos/domain/cpu_affinity.py +++ b/repos/domain/cpu_affinity.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test domain CPU affinity import os diff --git a/repos/domain/cpu_topology.py b/repos/domain/cpu_topology.py index af41f62..1862144 100644 --- a/repos/domain/cpu_topology.py +++ b/repos/domain/cpu_topology.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test domain cpu topology import os diff --git a/repos/domain/create.py b/repos/domain/create.py index 7b6a294..5129fec 100644 --- a/repos/domain/create.py +++ b/repos/domain/create.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create domain from xml import os diff --git a/repos/domain/destroy.py b/repos/domain/destroy.py index c41f0f8..56eef95 100644 --- a/repos/domain/destroy.py +++ b/repos/domain/destroy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/domain/detach_disk.py b/repos/domain/detach_disk.py index 1b0b7f9..fa07171 100644 --- a/repos/domain/detach_disk.py +++ b/repos/domain/detach_disk.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Detach a disk from domain import os diff --git a/repos/domain/detach_interface.py b/repos/domain/detach_interface.py index 050c019..369c0f5 100644 --- a/repos/domain/detach_interface.py +++ b/repos/domain/detach_interface.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Detach interface from domain import os diff --git a/repos/domain/domain_blkinfo.py b/repos/domain/domain_blkinfo.py index aa52668..4302ad4 100644 --- a/repos/domain/domain_blkinfo.py +++ b/repos/domain/domain_blkinfo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh domblkinfo" command import os diff --git a/repos/domain/domain_id.py b/repos/domain/domain_id.py index 844ce82..ce4aad7 100644 --- a/repos/domain/domain_id.py +++ b/repos/domain/domain_id.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh domid" command import os diff --git a/repos/domain/domain_list.py b/repos/domain/domain_list.py index 0250723..6b30150 100644 --- a/repos/domain/domain_list.py +++ b/repos/domain/domain_list.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh list" command import os diff --git a/repos/domain/domain_name.py b/repos/domain/domain_name.py index b9a8e43..0ec47fa 100644 --- a/repos/domain/domain_name.py +++ b/repos/domain/domain_name.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh domname" command import os diff --git a/repos/domain/domain_uuid.py b/repos/domain/domain_uuid.py index e66c3ee..7ba0c29 100644 --- a/repos/domain/domain_uuid.py +++ b/repos/domain/domain_uuid.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh domuuid" command import os diff --git a/repos/domain/domblkinfo.py b/repos/domain/domblkinfo.py index c543e41..b8a8cb0 100644 --- a/repos/domain/domblkinfo.py +++ b/repos/domain/domblkinfo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh domblkinfo" command import os diff --git a/repos/domain/dump.py b/repos/domain/dump.py index 01bdc93..9e49592 100644 --- a/repos/domain/dump.py +++ b/repos/domain/dump.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test core dump of a domain import os diff --git a/repos/domain/eventhandler.py b/repos/domain/eventhandler.py index 4eec6e9..047c2ca 100644 --- a/repos/domain/eventhandler.py +++ b/repos/domain/eventhandler.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test domain events import os diff --git a/repos/domain/hostname.py b/repos/domain/hostname.py index ac809aa..ef250ee 100644 --- a/repos/domain/hostname.py +++ b/repos/domain/hostname.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh hostname" command import os diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py index 32cc7af..70b89c4 100644 --- a/repos/domain/install_image.py +++ b/repos/domain/install_image.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py index 07a8307..e3dccc6 100644 --- a/repos/domain/install_linux_cdrom.py +++ b/repos/domain/install_linux_cdrom.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Install a linux domain from CDROM import os diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py index 351bba5..133e24c 100644 --- a/repos/domain/install_linux_check.py +++ b/repos/domain/install_linux_check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Checking method for linux domain installation. import os diff --git a/repos/domain/install_windows_cdrom.py b/repos/domain/install_windows_cdrom.py index aaff47d..8f49672 100644 --- a/repos/domain/install_windows_cdrom.py +++ b/repos/domain/install_windows_cdrom.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Install a Windows domain import os diff --git a/repos/domain/migrate.py b/repos/domain/migrate.py index 4c319e4..8b2ebda 100644 --- a/repos/domain/migrate.py +++ b/repos/domain/migrate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/domain/ownership_test.py b/repos/domain/ownership_test.py index ed7c992..9522131 100644 --- a/repos/domain/ownership_test.py +++ b/repos/domain/ownership_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Set the dynamic_ownership in /etc/libvirt/qemu.conf, # check the ownership of saved domain file. Test could # be on local or root_squash nfs. The default owner of diff --git a/repos/domain/reboot.py b/repos/domain/reboot.py index a2bd75a..eecd66a 100644 --- a/repos/domain/reboot.py +++ b/repos/domain/reboot.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/domain/restore.py b/repos/domain/restore.py index ab0900f..3589b45 100644 --- a/repos/domain/restore.py +++ b/repos/domain/restore.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Restore domain from a saved statefile import os diff --git a/repos/domain/resume.py b/repos/domain/resume.py index 85237f7..1a2c2c9 100644 --- a/repos/domain/resume.py +++ b/repos/domain/resume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/domain/save.py b/repos/domain/save.py index 37f1b97..9c81ad0 100644 --- a/repos/domain/save.py +++ b/repos/domain/save.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Save domain as a statefile import os diff --git a/repos/domain/screenshot.py b/repos/domain/screenshot.py index eb5d0e2..085261e 100644 --- a/repos/domain/screenshot.py +++ b/repos/domain/screenshot.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test domain screenshot, the screenshot format is # hypervisor specific. diff --git a/repos/domain/shutdown.py b/repos/domain/shutdown.py index 3b97abc..8b7dae6 100644 --- a/repos/domain/shutdown.py +++ b/repos/domain/shutdown.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/domain/start.py b/repos/domain/start.py index f319c2e..521087b 100644 --- a/repos/domain/start.py +++ b/repos/domain/start.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/domain/suspend.py b/repos/domain/suspend.py index 1941b1c..1d68330 100644 --- a/repos/domain/suspend.py +++ b/repos/domain/suspend.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys import re diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py index 40961f4..83d400f 100644 --- a/repos/domain/update_devflag.py +++ b/repos/domain/update_devflag.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test domain device updating import os diff --git a/repos/interface/create.py b/repos/interface/create.py index b1cfe5e..15f7bf7 100644 --- a/repos/interface/create.py +++ b/repos/interface/create.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/interface/define.py b/repos/interface/define.py index 5d63989..be459ec 100644 --- a/repos/interface/define.py +++ b/repos/interface/define.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/interface/destroy.py b/repos/interface/destroy.py index 20ae0f1..f1c16c7 100644 --- a/repos/interface/destroy.py +++ b/repos/interface/destroy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/interface/iface_list.py b/repos/interface/iface_list.py index c6bd365..973d93f 100644 --- a/repos/interface/iface_list.py +++ b/repos/interface/iface_list.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/interface/iface_mac.py b/repos/interface/iface_mac.py index ce1828e..212bd14 100644 --- a/repos/interface/iface_mac.py +++ b/repos/interface/iface_mac.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/interface/iface_name.py b/repos/interface/iface_name.py index e95db28..b83d19e 100644 --- a/repos/interface/iface_name.py +++ b/repos/interface/iface_name.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/interface/undefine.py b/repos/interface/undefine.py index b123472..8cb4917 100644 --- a/repos/interface/undefine.py +++ b/repos/interface/undefine.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/libvirtd/qemu_hang.py b/repos/libvirtd/qemu_hang.py index b2d694b..1f99612 100644 --- a/repos/libvirtd/qemu_hang.py +++ b/repos/libvirtd/qemu_hang.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # QEMU get hang should not cause libvirtd hang or dead. This # test stop a qemu process and check whether libvird get hang. # For doing this test, a running domain is required. diff --git a/repos/libvirtd/upstart.py b/repos/libvirtd/upstart.py index 6cb31a4..3a9b550 100644 --- a/repos/libvirtd/upstart.py +++ b/repos/libvirtd/upstart.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Upstart libvirtd testing import os diff --git a/repos/network/network_list.py b/repos/network/network_list.py index 672ad79..0b3d9d2 100644 --- a/repos/network/network_list.py +++ b/repos/network/network_list.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh net-list" command import os diff --git a/repos/network/network_name.py b/repos/network/network_name.py index 8518de2..1daa957 100644 --- a/repos/network/network_name.py +++ b/repos/network/network_name.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh net-name" command import os diff --git a/repos/network/network_uuid.py b/repos/network/network_uuid.py index 4983056..8466403 100644 --- a/repos/network/network_uuid.py +++ b/repos/network/network_uuid.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test "virsh net-uuid" command import os diff --git a/repos/nodedevice/detach.py b/repos/nodedevice/detach.py index b94db5d..648b837 100644 --- a/repos/nodedevice/detach.py +++ b/repos/nodedevice/detach.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Detach a node device from host import os diff --git a/repos/nodedevice/reattach.py b/repos/nodedevice/reattach.py index adaf6c4..0e2eadf 100644 --- a/repos/nodedevice/reattach.py +++ b/repos/nodedevice/reattach.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Re-attach a node device to host import os diff --git a/repos/nodedevice/reset.py b/repos/nodedevice/reset.py index 11cfa63..f6f943a 100644 --- a/repos/nodedevice/reset.py +++ b/repos/nodedevice/reset.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Reset a node device import os diff --git a/repos/npiv/create_virtual_hba.py b/repos/npiv/create_virtual_hba.py index b21fcd0..36e0cd3 100644 --- a/repos/npiv/create_virtual_hba.py +++ b/repos/npiv/create_virtual_hba.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test vHBA creating with npiv. import os diff --git a/repos/regression/multiple_thread_block_on_domain_create.py b/repos/regression/multiple_thread_block_on_domain_create.py index 38030c2..5980b76 100644 --- a/repos/regression/multiple_thread_block_on_domain_create.py +++ b/repos/regression/multiple_thread_block_on_domain_create.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test RHBZ 672226 import os diff --git a/repos/remoteAccess/tcp_setup.py b/repos/remoteAccess/tcp_setup.py index a9d02cb..1b555f8 100644 --- a/repos/remoteAccess/tcp_setup.py +++ b/repos/remoteAccess/tcp_setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test connection via tcp protocol import os diff --git a/repos/remoteAccess/tls_setup.py b/repos/remoteAccess/tls_setup.py index 4661e03..fb5d4fc 100644 --- a/repos/remoteAccess/tls_setup.py +++ b/repos/remoteAccess/tls_setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/remoteAccess/unix_perm_sasl.py b/repos/remoteAccess/unix_perm_sasl.py index d5cd914..4ddb892 100644 --- a/repos/remoteAccess/unix_perm_sasl.py +++ b/repos/remoteAccess/unix_perm_sasl.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py index e124800..d5a16cf 100644 --- a/repos/sVirt/domain_nfs_start.py +++ b/repos/sVirt/domain_nfs_start.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # This test is for start a guest with img file on nfs storage. # Under SElinux boolean virt_use_nfs on or off, combine with # setting the dynamic_ownership in /etc/libvirt/qemu.conf, diff --git a/repos/snapshot/delete.py b/repos/snapshot/delete.py index c018cdb..1dcab77 100644 --- a/repos/snapshot/delete.py +++ b/repos/snapshot/delete.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/snapshot/file_flag.py b/repos/snapshot/file_flag.py index f2257f6..b2b3b5d 100644 --- a/repos/snapshot/file_flag.py +++ b/repos/snapshot/file_flag.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create a flag file in the guest OS import os diff --git a/repos/snapshot/flag_check.py b/repos/snapshot/flag_check.py index 218d7e4..19a01cd 100644 --- a/repos/snapshot/flag_check.py +++ b/repos/snapshot/flag_check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/snapshot/internal_create.py b/repos/snapshot/internal_create.py index 20f9bbb..910e7af 100644 --- a/repos/snapshot/internal_create.py +++ b/repos/snapshot/internal_create.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/snapshot/revert.py b/repos/snapshot/revert.py index d1820bf..6e6241e 100644 --- a/repos/snapshot/revert.py +++ b/repos/snapshot/revert.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/snapshot/snapshot_list.py b/repos/snapshot/snapshot_list.py index cbd68a8..5bcb6cd 100644 --- a/repos/snapshot/snapshot_list.py +++ b/repos/snapshot/snapshot_list.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/storage/activate_pool.py b/repos/storage/activate_pool.py index 1aa1f0d..c093f66 100644 --- a/repos/storage/activate_pool.py +++ b/repos/storage/activate_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/build_dir_pool.py b/repos/storage/build_dir_pool.py index 79ae026..5a4d3e0 100644 --- a/repos/storage/build_dir_pool.py +++ b/repos/storage/build_dir_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Build a storage pool of 'dir' type import os diff --git a/repos/storage/build_disk_pool.py b/repos/storage/build_disk_pool.py index 49ee856..c7f8c27 100644 --- a/repos/storage/build_disk_pool.py +++ b/repos/storage/build_disk_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/build_logical_pool.py b/repos/storage/build_logical_pool.py index c372db7..1068c7e 100644 --- a/repos/storage/build_logical_pool.py +++ b/repos/storage/build_logical_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/build_netfs_pool.py b/repos/storage/build_netfs_pool.py index f0e06ca..9889919 100644 --- a/repos/storage/build_netfs_pool.py +++ b/repos/storage/build_netfs_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/create_dir_pool.py b/repos/storage/create_dir_pool.py index f255a6e..f2a8800 100644 --- a/repos/storage/create_dir_pool.py +++ b/repos/storage/create_dir_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create a storage pool of 'dir' type import os diff --git a/repos/storage/create_dir_volume.py b/repos/storage/create_dir_volume.py index 7084d20..f340207 100644 --- a/repos/storage/create_dir_volume.py +++ b/repos/storage/create_dir_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Creat volume for storage pool of 'dir' type import os diff --git a/repos/storage/create_fs_pool.py b/repos/storage/create_fs_pool.py index e338428..be53a01 100644 --- a/repos/storage/create_fs_pool.py +++ b/repos/storage/create_fs_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create a storage pool of 'fs' type. import os diff --git a/repos/storage/create_iscsi_pool.py b/repos/storage/create_iscsi_pool.py index 889d2de..a7d92fd 100644 --- a/repos/storage/create_iscsi_pool.py +++ b/repos/storage/create_iscsi_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/create_logical_volume.py b/repos/storage/create_logical_volume.py index 8c20eb8..29b2a7d 100644 --- a/repos/storage/create_logical_volume.py +++ b/repos/storage/create_logical_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create a logical type storage volume import os diff --git a/repos/storage/create_netfs_pool.py b/repos/storage/create_netfs_pool.py index e37468c..fe25bc4 100644 --- a/repos/storage/create_netfs_pool.py +++ b/repos/storage/create_netfs_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create a netfs storage pool import os diff --git a/repos/storage/create_netfs_volume.py b/repos/storage/create_netfs_volume.py index 374eba6..8e35f8d 100644 --- a/repos/storage/create_netfs_volume.py +++ b/repos/storage/create_netfs_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Creat volume for storage pool of 'netfs' type import os diff --git a/repos/storage/create_partition_volume.py b/repos/storage/create_partition_volume.py index 02b91b6..91497b9 100644 --- a/repos/storage/create_partition_volume.py +++ b/repos/storage/create_partition_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Create volume for storage pool of partition type import os diff --git a/repos/storage/define_dir_pool.py b/repos/storage/define_dir_pool.py index c48e8e4..8d4fc61 100644 --- a/repos/storage/define_dir_pool.py +++ b/repos/storage/define_dir_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Define storage pool of 'dir' type import os diff --git a/repos/storage/define_disk_pool.py b/repos/storage/define_disk_pool.py index dcf7219..1e33c27 100644 --- a/repos/storage/define_disk_pool.py +++ b/repos/storage/define_disk_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Define a storage pool of 'disk' type import os diff --git a/repos/storage/define_iscsi_pool.py b/repos/storage/define_iscsi_pool.py index df61a24..f1930a1 100644 --- a/repos/storage/define_iscsi_pool.py +++ b/repos/storage/define_iscsi_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Define a storage pool of 'iscsi' type import os diff --git a/repos/storage/define_logical_pool.py b/repos/storage/define_logical_pool.py index 6c06a43..2398127 100644 --- a/repos/storage/define_logical_pool.py +++ b/repos/storage/define_logical_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Define a storage pool of 'logical' type import os diff --git a/repos/storage/define_mpath_pool.py b/repos/storage/define_mpath_pool.py index 5bb972c..37b15d1 100644 --- a/repos/storage/define_mpath_pool.py +++ b/repos/storage/define_mpath_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/define_netfs_pool.py b/repos/storage/define_netfs_pool.py index c522970..bc25c4c 100644 --- a/repos/storage/define_netfs_pool.py +++ b/repos/storage/define_netfs_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # To test netfs type storage pool defining import os diff --git a/repos/storage/define_scsi_pool.py b/repos/storage/define_scsi_pool.py index b163df8..2d8cdf4 100644 --- a/repos/storage/define_scsi_pool.py +++ b/repos/storage/define_scsi_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Define a storage pool of 'iscsi' type import os diff --git a/repos/storage/delete_dir_volume.py b/repos/storage/delete_dir_volume.py index 3a21d20..8e21f0e 100644 --- a/repos/storage/delete_dir_volume.py +++ b/repos/storage/delete_dir_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Delete volume from storage pool of 'dir' type import os diff --git a/repos/storage/delete_logical_pool.py b/repos/storage/delete_logical_pool.py index f2904e6..4851e64 100644 --- a/repos/storage/delete_logical_pool.py +++ b/repos/storage/delete_logical_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Delete a storage pool of 'logical' type import os diff --git a/repos/storage/delete_logical_volume.py b/repos/storage/delete_logical_volume.py index 1650a85..639b113 100644 --- a/repos/storage/delete_logical_volume.py +++ b/repos/storage/delete_logical_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Delete a logical type storage volume import os diff --git a/repos/storage/delete_netfs_volume.py b/repos/storage/delete_netfs_volume.py index b03889b..085cc51 100644 --- a/repos/storage/delete_netfs_volume.py +++ b/repos/storage/delete_netfs_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # Delete a volume from netfs type storage pool import os diff --git a/repos/storage/delete_partition_volume.py b/repos/storage/delete_partition_volume.py index 8a61a1d..b177743 100644 --- a/repos/storage/delete_partition_volume.py +++ b/repos/storage/delete_partition_volume.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/destroy_pool.py b/repos/storage/destroy_pool.py index 01547a4..ebb8994 100644 --- a/repos/storage/destroy_pool.py +++ b/repos/storage/destroy_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/repos/storage/pool_name.py b/repos/storage/pool_name.py index ce14da5..eed2111 100644 --- a/repos/storage/pool_name.py +++ b/repos/storage/pool_name.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/storage/pool_uuid.py b/repos/storage/pool_uuid.py index 7fa03b9..6512a08 100644 --- a/repos/storage/pool_uuid.py +++ b/repos/storage/pool_uuid.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import sys diff --git a/repos/storage/undefine_pool.py b/repos/storage/undefine_pool.py index 8fe26c4..5fef225 100644 --- a/repos/storage/undefine_pool.py +++ b/repos/storage/undefine_pool.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python import os import re diff --git a/utils/XMLParser.py b/utils/XMLParser.py index 4d7fc72..6405656 100644 --- a/utils/XMLParser.py +++ b/utils/XMLParser.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # XMLParser.py: Parse XML document, the result is a python dict. diff --git a/utils/check.py b/utils/check.py index 7f35418..5048587 100644 --- a/utils/check.py +++ b/utils/check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # check.py: Check methods for cases. # diff --git a/utils/dev_num.sh b/utils/dev_num.sh index 9f50398..bfe143f 100755 --- a/utils/dev_num.sh +++ b/utils/dev_num.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # counting disk and interface numbers guestname=$1 diff --git a/utils/disk_num.sh b/utils/disk_num.sh index 97a6248..43c09bc 100755 --- a/utils/disk_num.sh +++ b/utils/disk_num.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh guestname=$1 if [[ -z $guestname ]]; then diff --git a/utils/env_parser.py b/utils/env_parser.py index e756a38..e59f283 100644 --- a/utils/env_parser.py +++ b/utils/env_parser.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # env_parser.py: Parser for environment config (env.cfg). # diff --git a/utils/format.py b/utils/format.py index 2a35664..fab79d4 100644 --- a/utils/format.py +++ b/utils/format.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # format.py: Print logging message in specific format. # diff --git a/utils/ipget.sh b/utils/ipget.sh index 8d44b14..677dd0b 100755 --- a/utils/ipget.sh +++ b/utils/ipget.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh mac=$1 if [[ -z $mac ]]; then diff --git a/utils/ksiso.sh b/utils/ksiso.sh index b7f9fb8..606281c 100755 --- a/utils/ksiso.sh +++ b/utils/ksiso.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! /bin/bash # - simple support to add kernel args diff --git a/utils/log.py b/utils/log.py index 4111fd9..58156d3 100644 --- a/utils/log.py +++ b/utils/log.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # log.py: Classes for logging. # diff --git a/utils/stats.sh b/utils/stats.sh index 565dbac..cf2765b 100755 --- a/utils/stats.sh +++ b/utils/stats.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! /bin/bash if [ ! -d $(pwd)/coverage ]; then mkdir -p $(pwd)/coverage diff --git a/utils/utils.py b/utils/utils.py index 124c986..b9c6878 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # Copyright (C) 2010-2012 Red Hat, Inc. # diff --git a/utils/xmlbuilder.py b/utils/xmlbuilder.py index d2ce6bb..d3854d1 100644 --- a/utils/xmlbuilder.py +++ b/utils/xmlbuilder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # xmlbuilder.py: Class for building XML for libvirt objects. # diff --git a/utils/xmlgenerator.py b/utils/xmlgenerator.py index ee019b7..167d61a 100644 --- a/utils/xmlgenerator.py +++ b/utils/xmlgenerator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#! /usr/bin/env/ python # # xmlgenerator.py: Generate XML for libvirt objects. # -- 1.7.7.3

3 4

[libvirt] [PATCH 0/9] Add basic driver for Parallels Virtuozzo Server
by Dmitry Guryanov 18 Apr '12

18 Apr '12

Parallels Virtuozzo Server is a cloud-ready virtualization solution that allows users to simultaneously run multiple virtual machines and containers on the same physical server. Current name of this product is Parallels Server Bare Metal and more information about it can be found here - http://www.parallels.com/products/server/baremetal/sp/. This driver will work with PVS version 6.0 , beta version scheduled at 2012 Q2. Dmitry Guryanov (9): pvs: add driver skeleton util: add functions for interating over json object pvs: add functions to list domains and get info pvs: implement functions for domain life cycle management pvs: get info about serial ports pvs: add support of VNC remote display pvs: implement virDomainDefineXML operation for existing domains pvs: add storage driver pvs: implement VM creation cfg.mk | 1 + configure.ac | 20 + docs/drvpvs.html.in | 28 + include/libvirt/virterror.h | 1 + libvirt.spec.in | 7 + mingw32-libvirt.spec.in | 6 + po/POTFILES.in | 1 + src/Makefile.am | 23 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 12 + src/pvs/pvs_driver.c | 1259 +++++++++++++++++++++++++++++++++++++ src/pvs/pvs_driver.h | 76 +++ src/pvs/pvs_storage.c | 1460 +++++++++++++++++++++++++++++++++++++++++++ src/pvs/pvs_utils.c | 139 ++++ src/util/json.c | 30 + src/util/json.h | 4 + src/util/virterror.c | 3 + 19 files changed, 3074 insertions(+), 1 deletions(-) create mode 100644 docs/drvpvs.html.in create mode 100644 src/pvs/pvs_driver.c create mode 100644 src/pvs/pvs_driver.h create mode 100644 src/pvs/pvs_storage.c create mode 100644 src/pvs/pvs_utils.c

2 12

[libvirt] [PATCH] Fix a memory leak
by Stefan Berger 17 Apr '12

17 Apr '12

The below patch fixes the following memory leak. ==20624== 24 bytes in 2 blocks are definitely lost in loss record 532 of 1,867 ==20624== at 0x4A05E46: malloc (vg_replace_malloc.c:195) ==20624== by 0x38EC27FC01: strdup (strdup.c:43) ==20624== by 0x4EB6BA3: virDomainChrSourceDefCopy (domain_conf.c:1122) ==20624== by 0x495D76: qemuProcessFindCharDevicePTYs (qemu_process.c:1497) ==20624== by 0x498321: qemuProcessWaitForMonitor (qemu_process.c:1258) ==20624== by 0x49B5F9: qemuProcessStart (qemu_process.c:3652) ==20624== by 0x468B5C: qemuDomainObjStart (qemu_driver.c:4753) ==20624== by 0x469171: qemuDomainStartWithFlags (qemu_driver.c:4810) ==20624== by 0x4F21735: virDomainCreate (libvirt.c:8153) ==20624== by 0x4302BF: remoteDispatchDomainCreateHelper (remote_dispatch.h:852) ==20624== by 0x4F72C14: virNetServerProgramDispatch (virnetserverprogram.c:416) ==20624== by 0x4F6D690: virNetServerHandleJob (virnetserver.c:164) ==20624== by 0x4E8F43D: virThreadPoolWorker (threadpool.c:144) ==20624== by 0x4E8EAB5: virThreadHelper (threads-pthread.c:161) ==20624== by 0x38EC606CCA: start_thread (pthread_create.c:301) ==20624== by 0x38EC2E0C2C: clone (clone.S:115) --- I am wondering whether 'something' did not work properly before due to the missing assignment below? --- src/conf/domain_conf.c | 2 ++ 1 file changed, 2 insertions(+) Index: libvirt-acl/src/conf/domain_conf.c =================================================================== --- libvirt-acl.orig/src/conf/domain_conf.c +++ libvirt-acl/src/conf/domain_conf.c @@ -1174,6 +1174,8 @@ virDomainChrSourceDefCopy(virDomainChrSo break; } + dest->type = src->type; + return 0; }

2 2

[libvirt] [libvirt-glib 1/2] Parse GVirConfigDomainController nodes
by Christophe Fergeau 17 Apr '12

17 Apr '12

Update gvir_config_domain_device_new_from_tree to handle GVirConfigDomainController nodes --- .../libvirt-gconfig-domain-controller.c | 37 ++++++++++++++++++++ .../libvirt-gconfig-domain-device-private.h | 3 ++ libvirt-gconfig/libvirt-gconfig-domain-device.c | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-controller.c b/libvirt-gconfig/libvirt-gconfig-domain-controller.c index 813c934..2024b54 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-controller.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-controller.c @@ -49,6 +49,43 @@ static void gvir_config_domain_controller_init(GVirConfigDomainController *contr controller->priv = GVIR_CONFIG_DOMAIN_CONTROLLER_GET_PRIVATE(controller); } +G_GNUC_INTERNAL GVirConfigDomainDevice * +gvir_config_domain_controller_new_from_tree(GVirConfigXmlDoc *doc, + xmlNodePtr tree) +{ + const char *type; + GType gtype; + + type = gvir_config_xml_get_attribute_content(tree, "type"); + if (type == NULL) + return NULL; + + if (g_str_equal(type, "ide")) { + goto unimplemented; + } else if (g_str_equal(type, "fdc")) { + goto unimplemented; + } else if (g_str_equal(type, "scsi")) { + goto unimplemented; + } else if (g_str_equal(type, "sata")) { + goto unimplemented; + } else if (g_str_equal(type, "usb")) { + gtype = GVIR_CONFIG_TYPE_DOMAIN_CONTROLLER_USB;; + } else if (g_str_equal(type, "ccid")) { + goto unimplemented; + } else if (g_str_equal(type, "virtio-serial")) { + goto unimplemented; + } else { + g_debug("Unknown domain controller node: %s", type); + return NULL; + } + + return GVIR_CONFIG_DOMAIN_DEVICE(gvir_config_object_new_from_tree(gtype, doc, NULL, tree)); + +unimplemented: + g_debug("Parsing of '%s' domain controller nodes is unimplemented", type); + return NULL; +} + void gvir_config_domain_controller_set_index(GVirConfigDomainController *controller, guint index) { diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device-private.h b/libvirt-gconfig/libvirt-gconfig-domain-device-private.h index 7ba7bc6..f50946a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device-private.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-device-private.h @@ -31,6 +31,9 @@ GVirConfigDomainDevice * gvir_config_domain_device_new_from_tree(GVirConfigXmlDoc *doc, xmlNodePtr tree); GVirConfigDomainDevice * +gvir_config_domain_controller_new_from_tree(GVirConfigXmlDoc *doc, + xmlNodePtr tree); +GVirConfigDomainDevice * gvir_config_domain_disk_new_from_tree(GVirConfigXmlDoc *doc, xmlNodePtr tree); GVirConfigDomainDevice * diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device.c b/libvirt-gconfig/libvirt-gconfig-domain-device.c index 82e57e9..2f76c8b 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-device.c @@ -64,7 +64,7 @@ gvir_config_domain_device_new_from_tree(GVirConfigXmlDoc *doc, } else if (xmlStrEqual(tree->name, (xmlChar*)"filesystem")) { type = GVIR_CONFIG_TYPE_DOMAIN_FILESYS; } else if (xmlStrEqual(tree->name, (xmlChar*)"controller")) { - goto unimplemented; + return gvir_config_domain_controller_new_from_tree(doc, tree); } else if (xmlStrEqual(tree->name, (xmlChar*)"lease")) { goto unimplemented; } else if (xmlStrEqual(tree->name, (xmlChar*)"hostdev")) { -- 1.7.10

2 3

[libvirt] [PATCH v2] docs: Improve the schema for fs device
by Osier Yang 17 Apr '12

17 Apr '12

<filesystemtgt> is redundant, as every group uses it; <address> shouldn't be in <filesystemtgt> in case of the meaning could be "filesystemtarget"; The elements <address>, <alias>, <target>, ... should be interleaved. --- v1 ~ v2: No changes --- docs/schemas/domaincommon.rng | 58 ++++++++++++++++++---------------------- 1 files changed, 26 insertions(+), 32 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 0cc04af..f116710 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1210,7 +1210,6 @@ </attribute> <empty/> </element> - <ref name="filesystemtgt"/> </interleave> </group> <group> @@ -1224,7 +1223,6 @@ </attribute> <empty/> </element> - <ref name="filesystemtgt"/> </interleave> </group> <group> @@ -1257,7 +1255,6 @@ <empty/> </element> </optional> - <ref name="filesystemtgt"/> </interleave> </group> <group> @@ -1271,42 +1268,39 @@ </attribute> <empty/> </element> - <ref name="filesystemtgt"/> </interleave> </group> </choice> - <optional> - <attribute name="accessmode"> - <choice> - <value>passthrough</value> - <value>mapped</value> - <value>squash</value> - </choice> - </attribute> - </optional> - <optional> - <element name='readonly'> + <interleave> + <element name="target"> + <attribute name="dir"> + <ref name="absDirPath"/> + </attribute> <empty/> </element> - </optional> + <optional> + <attribute name="accessmode"> + <choice> + <value>passthrough</value> + <value>mapped</value> + <value>squash</value> + </choice> + </attribute> + </optional> + <optional> + <element name='readonly'> + <empty/> + </element> + </optional> + <optional> + <ref name="alias"/> + </optional> + <optional> + <ref name="address"/> + </optional> + </interleave> </element> </define> - <define name="filesystemtgt"> - <interleave> - <optional> - <ref name="alias"/> - </optional> - <optional> - <ref name="address"/> - </optional> - <element name="target"> - <attribute name="dir"> - <ref name="absDirPath"/> - </attribute> - <empty/> - </element> - </interleave> - </define> <!-- An interface description can either be of type bridge in which case it will use a bridging source, or of type ethernet which uses a device -- 1.7.7.3

2 2

[libvirt] [PATCH] libvirt: xen: do not use ioemu type for any emulated NIC
by Stefan Bader 17 Apr '12

17 Apr '12

This is a re-send as there was some positive feedback but the patch itself made it into the repo. -Stefan >From a3198c5c1ae8908818f6c0f0df4237dbe5ddeec7 Mon Sep 17 00:00:00 2001 From: Stefan Bader <stefan.bader(a)canonical.com> Date: Thu, 12 Apr 2012 15:32:41 +0200 Subject: [PATCH] libvirt: xen: do not use ioemu type for any emulated NIC When using the xm/xend stack to manage instances there is a bug that causes the emulated interfaces to be unusable when the vif config contains type=ioemu (MAC address all zero). The current code already has a special quirk to not use this keyword if no specific model is given for the emulated NIC (defaulting to rtl8139). Essentially it works because regardless of the type argument, the Xen stack always creates emulated and paravirt interfaces and lets the guest decide which one to use. So neither xl nor xm stack actually require the type keyword for emulated NICs. Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> --- src/xenxs/xen_sxpr.c | 4 +++- src/xenxs/xen_xm.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index e1bbd76..71602fa 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -2012,7 +2012,9 @@ xenFormatSxprNet(virConnectPtr conn, } else { virBufferEscapeSexpr(buf, "(model '%s')", def->model); - virBufferAddLit(buf, "(type ioemu)"); + /* See above. Also needed when model is specified. */ + if (xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) + virBufferAddLit(buf, "(type ioemu)"); } if (!isAttach) diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index d65e97a..e072599 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -1394,7 +1394,9 @@ static int xenFormatXMNet(virConnectPtr conn, } else { virBufferAsprintf(&buf, ",model=%s", net->model); - virBufferAddLit(&buf, ",type=ioemu"); + /* See above. Also needed if model is specified. */ + if (xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) + virBufferAddLit(&buf, ",type=ioemu"); } if (net->ifname) -- 1.7.9.5

4 19

[libvirt] "virsh list" hangs
by Qian Zhang 17 Apr '12

17 Apr '12

Hi, I am using RHEL 6.2 64bit, and the libvirt shipped in it is "libvirt-0.9.4-23.el6.x86_64". I found sometimes the command "virsh list" hangs forever, and same issue for virt-manager which is always in "Connecting" status. But after restarting the libvirtd service, this issue is gone. Is this a bug of libvirt? Any help will be appreciated. Thanks, Qian

4 6

Re: [libvirt] [PATCH 7/8] block: add witness argument to drive-reopen
by Eric Blake 17 Apr '12

17 Apr '12

[adding libvir-list for some interesting discussions on potential libvirt design issues] On 04/17/2012 12:47 AM, Paolo Bonzini wrote: > Il 16/04/2012 23:55, Eric Blake ha scritto: >>> Do transient guests have persistent storage for them in /var while they >>> are running? >> >> Yes - that's how libvirt tracks the pid of the qemu process that it >> should be re-attaching to on a libvirtd restart, as well as several >> other aspects (for example, the capabilities of the qemu binary running >> that pid, in case qemu has been upgraded in the meantime). It's just >> that right now, the files that libvirt stores in /var are intended to be >> internal to libvirt, so management apps shouldn't be poking around in >> there, so much as having an interface to ask libvirt what state things >> are in. > > Can libvirtd report the block-job-completed event to vdsm before the > transient-domain-died event? Yes, it should be possible to organize the code so that on libvirtd restart, libvirt is careful to emit all other events, such as block-job completed/failed, prior to the final domain died event as libvirt cleans out its records of the dead domain. But it probably involves quite a bit of code cleanup on libvirt's side to reach that state. There's also the question of whether vdsm will be listening to the events soon enough; after all, when libvirtd restarts, libvirt is doing quite a bit of bookkeeping before even accepting connections, and if vdsm isn't connected to the restarted libvirt at the time libvirt queues up an event to be sent, then the event is lost. Maybe that implies that libvirt needs to have a configurable-depth array of prior events that can be played back to the user on request. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCHv4 00/18] live block migration via virDomainBlockCopy
by Eric Blake 17 Apr '12

17 Apr '12

v3 was here: https://www.redhat.com/archives/libvir-list/2012-April/msg00288.html changes from v3: - split v3 patch 8 into 1/18 and 9/18 - incorporate Laine's review comments on v3 patches 1 and 2 (here 2 and 3) - fix more bugs found during testing - upgrade to Paolo's latest build (which dropped 'mode':'no-backing-file' and replaced it with 'full':'true') - added a new patch 14/18 that lets blockcopy work with SELinux enforcing (it still leaks files rather than clean up context on job abort or pivot, but that's a harder problem to solve) repo.or.cz is acting up on me at the moment, so I won't have a repo to point to until I can investigate why tomorrow. I'll send an interdiff in reply to this message. Adam Litke (2): blockjob: add API for async virDomainBlockJobAbort blockjob: wire up qemu async virDomainBlockJobAbort Eric Blake (16): blockjob: add qemu capabilities related to block jobs blockjob: allow for fast-finishing job blockjob: add new API flags blockjob: add 'blockcopy' to virsh blockjob: enhance xml to track mirrors across libvirtd restart blockjob: react to active block copy blockjob: expose qemu commands for mirrored storage migration blockjob: return appropriate event and info blockjob: support pivot operation on cancel blockjob: implement block copy for qemu blockjob: allow for existing files blockjob: allow mirroring under SELinux blockjob: accommodate RHEL backport names blockjob: add virDomainBlockCopy blockjob: enhance virsh 'blockcopy' blockjob: wire up qemu and RPC for block copy docs/apibuild.py | 1 + docs/formatdomain.html.in | 11 + docs/schemas/domaincommon.rng | 19 ++- include/libvirt/libvirt.h.in | 50 +++++- include/libvirt/virterror.h | 1 + src/conf/domain_conf.c | 54 ++++++ src/conf/domain_conf.h | 6 + src/driver.h | 5 + src/libvirt.c | 223 +++++++++++++++++++++- src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 417 +++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_hotplug.c | 7 + src/qemu/qemu_monitor.c | 50 +++++ src/qemu/qemu_monitor.h | 18 ++- src/qemu/qemu_monitor_json.c | 167 ++++++++++++++--- src/qemu/qemu_monitor_json.h | 19 ++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 12 +- src/remote_protocol-structs | 9 + src/rpc/gendispatch.pl | 1 + src/util/virterror.c | 6 + tools/virsh.c | 141 +++++++++++--- tools/virsh.pod | 65 ++++++- 26 files changed, 1195 insertions(+), 99 deletions(-) -- 1.7.7.6

4 58

[libvirt] cgroup cpuset limited by default?
by Marc-André Lureau 17 Apr '12

17 Apr '12

Hi, I noticed recently that my system VMs feel much slower, and that seems to be because of cpuset cgroup which constrain the VM on the first cpu. This doesn't happen with session VMs, since they are not ruled by cgroup. I run f17 with libvirt git, the VMs are created with virt-manager, using mostly default settings <vcpu>4</vcpu> <os> <type arch='x86_64' machine='pc-0.15'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='localtime'/> Is that intended or is it a bug? -- Marc-André Lureau

3 6

[libvirt] [PATCH v2] qemu: Split ide-drive into ide-cd and ide-hd
by Osier Yang 17 Apr '12

17 Apr '12

A "ide-drive" device can be either a hard disk or a CD-ROM, if there is ",media=cdrom" specified for the backend, it's a CD-ROM, otherwise it's a hard disk. Upstream qemu splitted "ide-drive" into "ide-hd" and "ide-cd" since commit 1f56e32, and ",media=cdrom" is not required for ide-cd anymore. "ide-drive" is still supported for backwards compatibility, but no doubt we should go foward. --- No changes between v1 and v2, just rebasing. --- src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 25 ++++++++++++++- tests/qemuhelptest.c | 3 +- .../qemuxml2argv-disk-ide-drive-split.args | 8 +++++ .../qemuxml2argv-disk-ide-drive-split.xml | 32 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 7 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4e22f3e8..3d1fb43 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -160,6 +160,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "block-job-sync", /* 90 */ "block-job-async", "scsi-cd", + "ide-cd", ); struct qemu_feature_flags { @@ -1454,6 +1455,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_SCSI_BLOCK); if (strstr(str, "scsi-cd")) qemuCapsSet(flags, QEMU_CAPS_SCSI_CD); + if (strstr(str, "ide-cd")) + qemuCapsSet(flags, QEMU_CAPS_IDE_CD); return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2aba502..7279cdb 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -127,6 +127,7 @@ enum qemuCapsFlags { QEMU_CAPS_BLOCKJOB_SYNC = 90, /* RHEL 6.2 block_job_cancel */ QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* qemu 1.1 block-job-cancel */ QEMU_CAPS_SCSI_CD = 92, /* -device scsi-cd */ + QEMU_CAPS_IDE_CD = 93, /* -device ide-cd */ 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 ff82b26..26f691f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1982,6 +1982,9 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, if ((disk->bus == VIR_DOMAIN_DISK_BUS_SCSI)) { if (!qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) virBufferAddLit(&opt, ",media=cdrom"); + } else if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE) { + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) + virBufferAddLit(&opt, ",media=cdrom"); } else { virBufferAddLit(&opt, ",media=cdrom"); } @@ -2205,7 +2208,16 @@ qemuBuildDriveDevStr(virDomainDefPtr def, _("target must be 0 for ide controller")); goto error; } - virBufferAddLit(&opt, "ide-drive"); + + if (qemuCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "ide-cd"); + else + virBufferAddLit(&opt, "ide-hd"); + } else { + virBufferAddLit(&opt, "ide-drive"); + } + virBufferAsprintf(&opt, ",bus=ide.%d,unit=%d", disk->info.addr.drive.bus, disk->info.addr.drive.unit); @@ -2301,7 +2313,16 @@ qemuBuildDriveDevStr(virDomainDefPtr def, _("target must be 0 for ide controller")); goto error; } - virBufferAddLit(&opt, "ide-drive"); + + if (qemuCapsGet(qemuCaps, QEMU_CAPS_IDE_CD)) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "ide-cd"); + else + virBufferAddLit(&opt, "ide-hd"); + } else { + virBufferAddLit(&opt, "ide-drive"); + } + virBufferAsprintf(&opt, ",bus=ahci%d.%d", disk->info.addr.drive.controller, disk->info.addr.drive.unit); diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index a01c389..d23b35a 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -676,7 +676,8 @@ mymain(void) QEMU_CAPS_CPU_HOST, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_SCSI_BLOCK, - QEMU_CAPS_SCSI_CD); + QEMU_CAPS_SCSI_CD, + QEMU_CAPS_IDE_CD); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args new file mode 100644 index 0000000..e24490d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args @@ -0,0 +1,8 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-1 \ +-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-drive file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 \ +-device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \ +-usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml new file mode 100644 index 0000000..b965677 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/idedisk.img'/> + <target dev='hdc' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='2'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='ide' index='1'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index cc1ac44..ee7a8e1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -758,6 +758,9 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("pseries-vio-address-clash", true, QEMU_CAPS_DRIVE, QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("disk-ide-drive-split", false, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_IDE_CD); VIR_FREE(driver.stateDir); virCapabilitiesFree(driver.caps); -- 1.7.7.3

2 2

[libvirt] [PATCH v2] qemu: Split scsi-disk into into scsi-hd and scsi-cd
by Osier Yang 17 Apr '12

17 Apr '12

A "scsi-disk" device can be either a hard disk or a CD-ROM, if there is ",media=cdrom" specified for the backend, it's a CD-ROM, otherwise it's a hard disk. But upstream qemu splitted "scsi-disk" into "scsi-hd" and "scsi-cd" since commit b443ae, and ",media=cdrom" is not required for scsi-cd anymore. "scsi-disk" is still supported for backwards compatibility, but no doubt we should go foward. --- No changes since v1 --- src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 39 +++++++++++++++++++++++++++++++-------- tests/qemuhelptest.c | 6 ++++-- tests/qemuxml2argvtest.c | 3 +++ 5 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fd4ca4d..4e22f3e8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -159,6 +159,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "block-job-sync", /* 90 */ "block-job-async", + "scsi-cd", ); struct qemu_feature_flags { @@ -1451,6 +1452,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_SCSI_DISK_CHANNEL); if (strstr(str, "scsi-block")) qemuCapsSet(flags, QEMU_CAPS_SCSI_BLOCK); + if (strstr(str, "scsi-cd")) + qemuCapsSet(flags, QEMU_CAPS_SCSI_CD); return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6550d59..2aba502 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -126,6 +126,7 @@ enum qemuCapsFlags { QEMU_CAPS_TRANSACTION = 89, /* transaction monitor command */ QEMU_CAPS_BLOCKJOB_SYNC = 90, /* RHEL 6.2 block_job_cancel */ QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* qemu 1.1 block-job-cancel */ + QEMU_CAPS_SCSI_CD = 92, /* -device scsi-cd */ 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 c82f5bc..ff82b26 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1978,8 +1978,14 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, else virBufferAsprintf(&opt, "if=%s", bus); - if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) - virBufferAddLit(&opt, ",media=cdrom"); + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { + if ((disk->bus == VIR_DOMAIN_DISK_BUS_SCSI)) { + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) + virBufferAddLit(&opt, ",media=cdrom"); + } else { + virBufferAddLit(&opt, ",media=cdrom"); + } + } if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { virBufferAsprintf(&opt, ",id=%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias); @@ -2229,10 +2235,19 @@ qemuBuildDriveDevStr(virDomainDefPtr def, goto error; } - if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { virBufferAddLit(&opt, "scsi-block"); - else - virBufferAddLit(&opt, "scsi-disk"); + } else { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "scsi-cd"); + else + virBufferAddLit(&opt, "scsi-hd"); + } else { + virBufferAddLit(&opt, "scsi-disk"); + } + } + virBufferAsprintf(&opt, ",bus=scsi%d.%d,scsi-id=%d", disk->info.addr.drive.controller, disk->info.addr.drive.bus, @@ -2255,10 +2270,18 @@ qemuBuildDriveDevStr(virDomainDefPtr def, } } - if (disk->device != VIR_DOMAIN_DISK_DEVICE_LUN) - virBufferAddLit(&opt, "scsi-disk"); - else + if (disk->device != VIR_DOMAIN_DISK_DEVICE_LUN) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_CD)) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + virBufferAddLit(&opt, "scsi-cd"); + else + virBufferAddLit(&opt, "scsi-hd"); + } else { + virBufferAddLit(&opt, "scsi-disk"); + } + } else { virBufferAddLit(&opt, "scsi-block"); + } virBufferAsprintf(&opt, ",bus=scsi%d.0,channel=%d,scsi-id=%d,lun=%d", disk->info.addr.drive.controller, diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 05fdc4d..a01c389 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -605,7 +605,8 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_DRIVE_COPY_ON_READ, - QEMU_CAPS_CPU_HOST); + QEMU_CAPS_CPU_HOST, + QEMU_CAPS_SCSI_CD); DO_TEST("qemu-1.0", 1000000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -674,7 +675,8 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_CPU_HOST, QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_SCSI_BLOCK); + QEMU_CAPS_SCSI_BLOCK, + QEMU_CAPS_SCSI_CD); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fdbe95a..cc1ac44 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -463,6 +463,9 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-scsi-device-auto", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("disk-scsi-disk-split", false, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD); DO_TEST("disk-scsi-vscsi", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-scsi-virtio-scsi", false, -- 1.7.7.3

2 4

[libvirt] [PATCH] Do not enforce source type of console[0]
by Jan Kiszka 17 Apr '12

17 Apr '12

If console[0] is an alias for serial[0], do not enforce the former to have a PTY source type. This breaks serial consoles on stdio and makes no sense. Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> --- src/qemu/qemu_process.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ef311d1..216b594 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1376,7 +1376,6 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, if ((ret = virDomainChrSourceDefCopy(&chr->source, &((vm->def->serials[0])->source))) != 0) return ret; - chr->source.type = VIR_DOMAIN_CHR_TYPE_PTY; } else { if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY && chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) { -- 1.7.3.4

3 3

[libvirt] [PATCH] openvz: wire up more node information functions
by Guido Günther 17 Apr '12

17 Apr '12

in detail nodeGetCPUStats, nodeGetMemoryStats, nodeGetCellsFreeMemory and nodeGetFreeMemory --- src/openvz/openvz_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 3b2ffea..41fd8e4 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1704,6 +1704,10 @@ static virDriver openvzDriver = { .version = openvzGetVersion, /* 0.5.0 */ .getMaxVcpus = openvzGetMaxVCPUs, /* 0.4.6 */ .nodeGetInfo = nodeGetInfo, /* 0.3.2 */ + .nodeGetCPUStats = nodeGetCPUStats, /* 0.9.11 */ + .nodeGetMemoryStats = nodeGetMemoryStats, /* 0.9.11 */ + .nodeGetCellsFreeMemory = nodeGetCellsFreeMemory, /* 0.9.11 */ + .nodeGetFreeMemory = nodeGetFreeMemory, /* 0.9.11 */ .getCapabilities = openvzGetCapabilities, /* 0.4.6 */ .listDomains = openvzListDomains, /* 0.3.1 */ .numOfDomains = openvzNumDomains, /* 0.3.1 */ -- 1.7.9.5

3 4

[libvirt] 2 trivial doc patches
by Christophe Fergeau 16 Apr '12

16 Apr '12

Hey, I've just pushed these 2 documentation patches under the trivial rule. Christophe

1 2

[libvirt] OpenSSH authentification in Java libvirt API
by Alexandre Garnier 16 Apr '12

16 Apr '12

Hello, It seems that today you can’t authenticate on a qemu+ssh connection via OpenSSH without having to manually type the password in CLI or a pop-up window, using the Java API for libvirt. Being able to push a String in OpenSSH user input would be an easier and faster solution, for the end-user. Sincerely, Alexandre

1 0

[libvirt] [PATCH v2] qemuProcessStart: Switch to flags instead of bunch booleans
by Michal Privoznik 16 Apr '12

16 Apr '12

Currently, we have 3 boolean arguments we have to pass to qemuProcessStart(). As libvirt grows it is harder and harder to remember them and their position. Therefore we should switch to flags instead. --- diff to v1: -fix a test for START_PAUSED flag src/qemu/qemu_driver.c | 45 +++++++++++++++++++++++++++++---------------- src/qemu/qemu_migration.c | 7 ++++--- src/qemu/qemu_process.c | 21 +++++++++++++-------- src/qemu/qemu_process.h | 12 ++++++++---- 4 files changed, 54 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 65ed290..436ef37 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1351,10 +1351,16 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, virDomainPtr dom = NULL; virDomainEventPtr event = NULL; virDomainEventPtr event2 = NULL; + unsigned int start_flags = VIR_QEMU_PROCESS_START_COLD; virCheckFlags(VIR_DOMAIN_START_PAUSED | VIR_DOMAIN_START_AUTODESTROY, NULL); + if (flags & VIR_DOMAIN_START_PAUSED) + start_flags |= VIR_QEMU_PROCESS_START_PAUSED; + if (flags & VIR_DOMAIN_START_AUTODESTROY) + start_flags |= VIR_QEMU_PROCESS_START_AUTODESROY; + qemuDriverLock(driver); if (!(def = virDomainDefParseString(driver->caps, xml, QEMU_EXPECTED_VIRT_TYPES, @@ -1383,10 +1389,9 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; /* XXXX free the 'vm' we created ? */ - if (qemuProcessStart(conn, driver, vm, NULL, true, - (flags & VIR_DOMAIN_START_PAUSED) != 0, - (flags & VIR_DOMAIN_START_AUTODESTROY) != 0, - -1, NULL, NULL, VIR_NETDEV_VPORT_PROFILE_OP_CREATE) < 0) { + if (qemuProcessStart(conn, driver, vm, NULL, -1, NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, + start_flags) < 0) { virDomainAuditStart(vm, "booted", false); if (qemuDomainObjEndJob(driver, vm) > 0) qemuDomainRemoveInactive(driver, vm); @@ -4138,9 +4143,9 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, } /* Set the migration source and start it up. */ - ret = qemuProcessStart(conn, driver, vm, "stdio", false, true, - false, *fd, path, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_RESTORE); + ret = qemuProcessStart(conn, driver, vm, "stdio", *fd, path, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, + VIR_QEMU_PROCESS_START_PAUSED); if (intermediatefd != -1) { if (ret < 0) { @@ -4710,6 +4715,10 @@ qemuDomainObjStart(virConnectPtr conn, bool autodestroy = (flags & VIR_DOMAIN_START_AUTODESTROY) != 0; bool bypass_cache = (flags & VIR_DOMAIN_START_BYPASS_CACHE) != 0; bool force_boot = (flags & VIR_DOMAIN_START_FORCE_BOOT) != 0; + unsigned int start_flags = VIR_QEMU_PROCESS_START_COLD; + + start_flags |= start_paused ? VIR_QEMU_PROCESS_START_PAUSED : 0; + start_flags |= autodestroy ? VIR_QEMU_PROCESS_START_AUTODESROY : 0; /* * If there is a managed saved state restore it instead of starting @@ -4741,9 +4750,8 @@ qemuDomainObjStart(virConnectPtr conn, } } - ret = qemuProcessStart(conn, driver, vm, NULL, true, start_paused, - autodestroy, -1, NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_CREATE); + ret = qemuProcessStart(conn, driver, vm, NULL, -1, NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, start_flags); virDomainAuditStart(vm, "booted", ret >= 0); if (ret >= 0) { virDomainEventPtr event = @@ -11027,9 +11035,10 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (config) virDomainObjAssignDef(vm, config, false); - rc = qemuProcessStart(snapshot->domain->conn, driver, vm, NULL, - false, true, false, -1, NULL, snap, - VIR_NETDEV_VPORT_PROFILE_OP_CREATE); + rc = qemuProcessStart(snapshot->domain->conn, + driver, vm, NULL, -1, NULL, snap, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, + VIR_QEMU_PROCESS_START_PAUSED); virDomainAuditStart(vm, "from-snapshot", rc >= 0); detail = VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT; event = virDomainEventNewFromObj(vm, @@ -11114,12 +11123,16 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { /* Flush first event, now do transition 2 or 3 */ bool paused = (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED) != 0; + unsigned int start_flags = 0; + + start_flags |= paused ? VIR_QEMU_PROCESS_START_PAUSED : 0; if (event) qemuDomainEventQueue(driver, event); - rc = qemuProcessStart(snapshot->domain->conn, driver, vm, NULL, - false, paused, false, -1, NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_CREATE); + rc = qemuProcessStart(snapshot->domain->conn, + driver, vm, NULL, -1, NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, + start_flags); virDomainAuditStart(vm, "from-snapshot", rc >= 0); if (rc < 0) { if (!vm->persistent) { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index dc4d616..fc83805 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1303,9 +1303,10 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ - if (qemuProcessStart(dconn, driver, vm, migrateFrom, false, true, - true, dataFD[0], NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START) < 0) { + if (qemuProcessStart(dconn, driver, vm, migrateFrom, dataFD[0], NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, + VIR_QEMU_PROCESS_START_PAUSED | + VIR_QEMU_PROCESS_START_AUTODESROY) < 0) { virDomainAuditStart(vm, "migrated", false); /* Note that we don't set an error here because qemuProcessStart * should have already done that. diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 692fc32..ecbf039 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3271,13 +3271,11 @@ int qemuProcessStart(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, const char *migrateFrom, - bool cold_boot, - bool start_paused, - bool autodestroy, int stdin_fd, const char *stdin_path, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop) + enum virNetDevVPortProfileOp vmop, + unsigned int flags) { int ret; off_t pos = -1; @@ -3290,6 +3288,12 @@ int qemuProcessStart(virConnectPtr conn, unsigned long cur_balloon; int i; + /* Okay, these are just internal flags, + * but doesn't hurt to check */ + virCheckFlags(VIR_QEMU_PROCESS_START_COLD | + VIR_QEMU_PROCESS_START_PAUSED | + VIR_QEMU_PROCESS_START_AUTODESROY, -1); + hookData.conn = conn; hookData.vm = vm; hookData.driver = driver; @@ -3434,7 +3438,8 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; VIR_DEBUG("Checking for CDROM and floppy presence"); - if (qemuDomainCheckDiskPresence(driver, vm, cold_boot) < 0) + if (qemuDomainCheckDiskPresence(driver, vm, + flags & VIR_QEMU_PROCESS_START_COLD) < 0) goto cleanup; VIR_DEBUG("Setting up domain cgroup (if required)"); @@ -3633,7 +3638,7 @@ int qemuProcessStart(virConnectPtr conn, VIR_DEBUG("Handshake complete, child running"); if (migrateFrom) - start_paused = true; + flags |= VIR_QEMU_PROCESS_START_PAUSED; if (ret == -1) /* The VM failed to start; tear filters before taps */ virDomainConfVMNWFilterTeardown(vm); @@ -3708,7 +3713,7 @@ int qemuProcessStart(virConnectPtr conn, } qemuDomainObjExitMonitorWithDriver(driver, vm); - if (!start_paused) { + if (!(flags & VIR_QEMU_PROCESS_START_PAUSED)) { VIR_DEBUG("Starting domain CPUs"); /* Allow the CPUS to start executing */ if (qemuProcessStartCPUs(driver, vm, conn, @@ -3726,7 +3731,7 @@ int qemuProcessStart(virConnectPtr conn, VIR_DOMAIN_PAUSED_USER); } - if (autodestroy && + if (flags & VIR_QEMU_PROCESS_START_AUTODESROY && qemuProcessAutoDestroyAdd(driver, vm, conn) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 5cb5ffc..2d75b005 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -44,17 +44,21 @@ void qemuProcessReconnectAll(virConnectPtr conn, struct qemud_driver *driver); int qemuProcessAssignPCIAddresses(virDomainDefPtr def); +typedef enum { + VIR_QEMU_PROCESS_START_COLD = 1 << 0, + VIR_QEMU_PROCESS_START_PAUSED = 1 << 1, + VIR_QEMU_PROCESS_START_AUTODESROY = 1 << 2, +} qemuProcessStartFlags; + int qemuProcessStart(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, const char *migrateFrom, - bool cold_boot, - bool start_paused, - bool autodestroy, int stdin_fd, const char *stdin_path, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop); + enum virNetDevVPortProfileOp vmop, + unsigned int flags); void qemuProcessStop(struct qemud_driver *driver, virDomainObjPtr vm, -- 1.7.8.5

2 2

[libvirt] [libvirt-test-API PATCH 0/2] Documentation update
by Martin Kletzander 16 Apr '12

16 Apr '12

I updated part of the documentation that was changed in last few weeks. Screenshot test was updated again a little bit to suit the needs of a documentation and replaced the source codes of previous two tests mentioned in the documentation as it describe just what is needed and has no overhead on the reader. I'm not sure how the numbering goes in this case, but it can be updated later or I can send a v2 in case it needs to be fixed right away. Martin Kletzander (2): domain:screenshot: fixes and cleanup Documentation: Update to current information .../en-US/Understanding_libvirt-test-API.xml | 6 - .../en-US/Using_libvirt-test-API.xml | 26 +- .../en-US/Writing_a_test_case.xml | 325 ++++++++------------ .../libvirt-test-API_Guide/en-US/extras/log.txt | 53 ++-- repos/domain/screenshot.py | 45 ++- 5 files changed, 199 insertions(+), 256 deletions(-) -- 1.7.8.5

1 2

[libvirt] [ANNOUNCE] Perl binding Sys-Virt release 0.9.11
by Daniel P. Berrange 16 Apr '12

16 Apr '12

I am pleased to announce that release 0.9.11 of Sys-Virt, the libvirt Perl API binding is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-0.9.11.tar.gz Changed in this release: - Add all new APIs in libvirt 0.9.11 - Add test case to validate API coverage - Fix misc POD docs bugs - Fix reference handling in block stats - Add handling of VIR_TYPED_PARAM_STRING Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] docs: fix path to openvz network configuration file
by Guido Günther 16 Apr '12

16 Apr '12

It's vznet.conf not vznetctl.conf, see e.g.: http://git.openvz.org/?p=vzctl;a=blob;f=bin/vznetcfg.in;h=e91f5c4a0744c1ea1… --- docs/drvopenvz.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/drvopenvz.html.in b/docs/drvopenvz.html.in index bb437d3..a8f9f28 100644 --- a/docs/drvopenvz.html.in +++ b/docs/drvopenvz.html.in @@ -67,7 +67,7 @@ openvz+ssh://root@example.com/system (remote access, SSH tunnelled) script must be created manually by the host OS administrator. The simplest way is to just download the latest version of this script from a newer OpenVZ release, or upstream source repository. Then - a generic configuration file <code>/etc/vz/vznetctl.conf</code> + a generic configuration file <code>/etc/vz/vznet.conf</code> must be created containing </p> -- 1.7.10

3 3

[libvirt] [PATCH RESEND] qemuProcessStart: Switch to flags instead of bunch booleans
by Michal Privoznik 16 Apr '12

16 Apr '12

Currently, we have 3 boolean arguments we have to pass to qemuProcessStart(). As libvirt grows it is harder and harder to remember them and their position. Therefore we should switch to flags instead. --- This is just rebased version of: http://www.redhat.com/archives/libvir-list/2012-March/msg00331.html src/qemu/qemu_driver.c | 45 +++++++++++++++++++++++++++++---------------- src/qemu/qemu_migration.c | 7 ++++--- src/qemu/qemu_process.c | 21 +++++++++++++-------- src/qemu/qemu_process.h | 12 ++++++++---- 4 files changed, 54 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 65ed290..436ef37 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1351,10 +1351,16 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, virDomainPtr dom = NULL; virDomainEventPtr event = NULL; virDomainEventPtr event2 = NULL; + unsigned int start_flags = VIR_QEMU_PROCESS_START_COLD; virCheckFlags(VIR_DOMAIN_START_PAUSED | VIR_DOMAIN_START_AUTODESTROY, NULL); + if (flags & VIR_DOMAIN_START_PAUSED) + start_flags |= VIR_QEMU_PROCESS_START_PAUSED; + if (flags & VIR_DOMAIN_START_AUTODESTROY) + start_flags |= VIR_QEMU_PROCESS_START_AUTODESROY; + qemuDriverLock(driver); if (!(def = virDomainDefParseString(driver->caps, xml, QEMU_EXPECTED_VIRT_TYPES, @@ -1383,10 +1389,9 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; /* XXXX free the 'vm' we created ? */ - if (qemuProcessStart(conn, driver, vm, NULL, true, - (flags & VIR_DOMAIN_START_PAUSED) != 0, - (flags & VIR_DOMAIN_START_AUTODESTROY) != 0, - -1, NULL, NULL, VIR_NETDEV_VPORT_PROFILE_OP_CREATE) < 0) { + if (qemuProcessStart(conn, driver, vm, NULL, -1, NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, + start_flags) < 0) { virDomainAuditStart(vm, "booted", false); if (qemuDomainObjEndJob(driver, vm) > 0) qemuDomainRemoveInactive(driver, vm); @@ -4138,9 +4143,9 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, } /* Set the migration source and start it up. */ - ret = qemuProcessStart(conn, driver, vm, "stdio", false, true, - false, *fd, path, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_RESTORE); + ret = qemuProcessStart(conn, driver, vm, "stdio", *fd, path, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, + VIR_QEMU_PROCESS_START_PAUSED); if (intermediatefd != -1) { if (ret < 0) { @@ -4710,6 +4715,10 @@ qemuDomainObjStart(virConnectPtr conn, bool autodestroy = (flags & VIR_DOMAIN_START_AUTODESTROY) != 0; bool bypass_cache = (flags & VIR_DOMAIN_START_BYPASS_CACHE) != 0; bool force_boot = (flags & VIR_DOMAIN_START_FORCE_BOOT) != 0; + unsigned int start_flags = VIR_QEMU_PROCESS_START_COLD; + + start_flags |= start_paused ? VIR_QEMU_PROCESS_START_PAUSED : 0; + start_flags |= autodestroy ? VIR_QEMU_PROCESS_START_AUTODESROY : 0; /* * If there is a managed saved state restore it instead of starting @@ -4741,9 +4750,8 @@ qemuDomainObjStart(virConnectPtr conn, } } - ret = qemuProcessStart(conn, driver, vm, NULL, true, start_paused, - autodestroy, -1, NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_CREATE); + ret = qemuProcessStart(conn, driver, vm, NULL, -1, NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, start_flags); virDomainAuditStart(vm, "booted", ret >= 0); if (ret >= 0) { virDomainEventPtr event = @@ -11027,9 +11035,10 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (config) virDomainObjAssignDef(vm, config, false); - rc = qemuProcessStart(snapshot->domain->conn, driver, vm, NULL, - false, true, false, -1, NULL, snap, - VIR_NETDEV_VPORT_PROFILE_OP_CREATE); + rc = qemuProcessStart(snapshot->domain->conn, + driver, vm, NULL, -1, NULL, snap, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, + VIR_QEMU_PROCESS_START_PAUSED); virDomainAuditStart(vm, "from-snapshot", rc >= 0); detail = VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT; event = virDomainEventNewFromObj(vm, @@ -11114,12 +11123,16 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { /* Flush first event, now do transition 2 or 3 */ bool paused = (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED) != 0; + unsigned int start_flags = 0; + + start_flags |= paused ? VIR_QEMU_PROCESS_START_PAUSED : 0; if (event) qemuDomainEventQueue(driver, event); - rc = qemuProcessStart(snapshot->domain->conn, driver, vm, NULL, - false, paused, false, -1, NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_CREATE); + rc = qemuProcessStart(snapshot->domain->conn, + driver, vm, NULL, -1, NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_CREATE, + start_flags); virDomainAuditStart(vm, "from-snapshot", rc >= 0); if (rc < 0) { if (!vm->persistent) { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index dc4d616..fc83805 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1303,9 +1303,10 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ - if (qemuProcessStart(dconn, driver, vm, migrateFrom, false, true, - true, dataFD[0], NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START) < 0) { + if (qemuProcessStart(dconn, driver, vm, migrateFrom, dataFD[0], NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, + VIR_QEMU_PROCESS_START_PAUSED | + VIR_QEMU_PROCESS_START_AUTODESROY) < 0) { virDomainAuditStart(vm, "migrated", false); /* Note that we don't set an error here because qemuProcessStart * should have already done that. diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 692fc32..d18d721 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3271,13 +3271,11 @@ int qemuProcessStart(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, const char *migrateFrom, - bool cold_boot, - bool start_paused, - bool autodestroy, int stdin_fd, const char *stdin_path, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop) + enum virNetDevVPortProfileOp vmop, + unsigned int flags) { int ret; off_t pos = -1; @@ -3290,6 +3288,12 @@ int qemuProcessStart(virConnectPtr conn, unsigned long cur_balloon; int i; + /* Okay, these are just internal flags, + * but doesn't hurt to check */ + virCheckFlags(VIR_QEMU_PROCESS_START_COLD | + VIR_QEMU_PROCESS_START_PAUSED | + VIR_QEMU_PROCESS_START_AUTODESROY, -1); + hookData.conn = conn; hookData.vm = vm; hookData.driver = driver; @@ -3434,7 +3438,8 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; VIR_DEBUG("Checking for CDROM and floppy presence"); - if (qemuDomainCheckDiskPresence(driver, vm, cold_boot) < 0) + if (qemuDomainCheckDiskPresence(driver, vm, + flags & VIR_QEMU_PROCESS_START_COLD) < 0) goto cleanup; VIR_DEBUG("Setting up domain cgroup (if required)"); @@ -3633,7 +3638,7 @@ int qemuProcessStart(virConnectPtr conn, VIR_DEBUG("Handshake complete, child running"); if (migrateFrom) - start_paused = true; + flags |= VIR_QEMU_PROCESS_START_PAUSED; if (ret == -1) /* The VM failed to start; tear filters before taps */ virDomainConfVMNWFilterTeardown(vm); @@ -3708,7 +3713,7 @@ int qemuProcessStart(virConnectPtr conn, } qemuDomainObjExitMonitorWithDriver(driver, vm); - if (!start_paused) { + if (flags & ~VIR_QEMU_PROCESS_START_PAUSED) { VIR_DEBUG("Starting domain CPUs"); /* Allow the CPUS to start executing */ if (qemuProcessStartCPUs(driver, vm, conn, @@ -3726,7 +3731,7 @@ int qemuProcessStart(virConnectPtr conn, VIR_DOMAIN_PAUSED_USER); } - if (autodestroy && + if (flags & VIR_QEMU_PROCESS_START_AUTODESROY && qemuProcessAutoDestroyAdd(driver, vm, conn) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 5cb5ffc..2d75b005 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -44,17 +44,21 @@ void qemuProcessReconnectAll(virConnectPtr conn, struct qemud_driver *driver); int qemuProcessAssignPCIAddresses(virDomainDefPtr def); +typedef enum { + VIR_QEMU_PROCESS_START_COLD = 1 << 0, + VIR_QEMU_PROCESS_START_PAUSED = 1 << 1, + VIR_QEMU_PROCESS_START_AUTODESROY = 1 << 2, +} qemuProcessStartFlags; + int qemuProcessStart(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm, const char *migrateFrom, - bool cold_boot, - bool start_paused, - bool autodestroy, int stdin_fd, const char *stdin_path, virDomainSnapshotObjPtr snapshot, - enum virNetDevVPortProfileOp vmop); + enum virNetDevVPortProfileOp vmop, + unsigned int flags); void qemuProcessStop(struct qemud_driver *driver, virDomainObjPtr vm, -- 1.7.8.5

2 1

[libvirt] [PATCH] storage: lvm: use correct lv* command parameters
by Cole Robinson 16 Apr '12

16 Apr '12

lvcreate want's the parent pool's name, not the pool path lvchange and lvremove want lv specified as $vgname/$lvname This largely worked before because these commands strip off a starting /dev. But https://bugzilla.redhat.com/show_bug.cgi?id=714986 is from a user using a 'nested VG' that was having problems. I couldn't find any info on nested LVM and the reporter never responded, but I reproduced with XML that specified a valid source name, and set target path to a symlink. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/storage/storage_backend_logical.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 6a235f6..9a91dd9 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -672,7 +672,7 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, char size[100]; const char *cmdargvnew[] = { LVCREATE, "--name", vol->name, "-L", size, - pool->def->target.path, NULL + pool->def->source.name, NULL }; const char *cmdargvsnap[] = { LVCREATE, "--name", vol->name, "-L", size, @@ -778,23 +778,23 @@ virStorageBackendLogicalDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned int flags) { int ret = -1; + char *volpath = NULL; virCommandPtr lvchange_cmd = NULL; virCommandPtr lvremove_cmd = NULL; virCheckFlags(0, -1); - virFileWaitForDevices(); + if (virAsprintf(&volpath, "%s/%s", + pool->def->source.name, vol->name) < 0) { + virReportOOMError(); + goto cleanup; + } - lvchange_cmd = virCommandNewArgList(LVCHANGE, - "-aln", - vol->target.path, - NULL); + virFileWaitForDevices(); - lvremove_cmd = virCommandNewArgList(LVREMOVE, - "-f", - vol->target.path, - NULL); + lvchange_cmd = virCommandNewArgList(LVCHANGE, "-aln", volpath, NULL); + lvremove_cmd = virCommandNewArgList(LVREMOVE, "-f", volpath, NULL); if (virCommandRun(lvremove_cmd, NULL) < 0) { if (virCommandRun(lvchange_cmd, NULL) < 0) { @@ -807,6 +807,7 @@ virStorageBackendLogicalDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, ret = 0; cleanup: + VIR_FREE(volpath); virCommandFree(lvchange_cmd); virCommandFree(lvremove_cmd); return ret; -- 1.7.7.6

2 4

[libvirt] [PATCH] domain:screenshot: Added cleanup function
by Martin Kletzander 16 Apr '12

16 Apr '12

Added cleanup function to the screeshot testcase. This makes use of the new "sharedmod" module. --- WARNING: don't push this before the patch with sharedmod is pushed in the repo, otherwise this will not work. Thanks. repos/domain/screenshot.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/repos/domain/screenshot.py b/repos/domain/screenshot.py index 3e727a7..5a12c4b 100644 --- a/repos/domain/screenshot.py +++ b/repos/domain/screenshot.py @@ -6,6 +6,7 @@ import os import mimetypes import libvirt +import sharedmod required_params = ('guestname', 'filename',) optional_params = ('screen',) @@ -36,6 +37,7 @@ def screenshot(params): logger.debug('Mimetype of the file is %s' % mime) ret = st.finish() + sharedmod.dict['screenshot_filename'] = filename finally: # Some error occurred, cleanup @@ -43,3 +45,7 @@ def screenshot(params): conn.close() return ret + +def cleanup(params): + if sharedmod.has_key('screenshot_filename'): + os.remove(sharedmod['screenshot_filename']) -- 1.7.8.5

2 7

[libvirt] numad: Convert node list to cpumap before affinity setting
by Osier Yang 16 Apr '12

16 Apr '12

Previous patches on numad made mistake with thinking numad will return CPUs list (numad document says CPUs list one place, and node list another place. :( Please see the patches' commit message for the details. Osier Yang (3) numad: Convert node list to cpumap before setting affinity numad: Ignore cpuset if placement is auto qemu: Avoid the memory allocation and freeing docs/formatdomain.html.in | 10 ++++---- src/conf/domain_conf.c | 28 ++++++++++++++------------ src/qemu/qemu_process.c | 47 +++++++++++++++++++++++--------------------- 3 files changed, 45 insertions(+), 40 deletions(-) Regards, Osier

2 7

[libvirt] [test-API PATCH 1/2] add a new option -t to print template of testcase config file
by Guannan Ren 16 Apr '12

16 Apr '12

If a given testcase has clean function, the clean flag will be used automatically # python libvirt-test-api.py -t repos/domain/attach_disk.py \ repos/storage/create_netfs_pool.py \ repos/domain/save.py output: domain:attach_disk guestname GUESTNAME guesttype GUESTTYPE imagename IMAGENAME imagesize IMAGESIZE hdmodel HDMODEL storage:create_netfs_pool poolname POOLNAME sourcename SOURCENAME sourcepath SOURCEPATH pooltype POOLTYPE [targetpath] TARGETPATH domain:save guestname GUESTNAME filepath FILEPATH clean --- libvirt-test-api.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- proxy.py | 17 +++++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/libvirt-test-api.py b/libvirt-test-api.py index c171276..385b52d 100644 --- a/libvirt-test-api.py +++ b/libvirt-test-api.py @@ -35,6 +35,7 @@ def usage(): print "Usage: libvirt_test_api.py <OPTIONS> <ARGUS>" print "\noptions: -h, --help : Display usage information \ \n -c, --casefile: Specify configuration file \ + \n -t, --template: Print testcase config file template \ \n -f, --logxml: Specify log file with type xml \ \n -l, --log-level: 0 or 1 currently \ \n -d, --delete-log: Delete log items \ @@ -45,6 +46,7 @@ def usage(): print "example: \ \n python libvirt-test-api.py -l 0|1 -c TEST.CONF \ \n python libvirt-test-api.py -c TEST.CONF -f TEST.XML \ + \n python libvirt-test-api.py -t repos/domain/start.py ... \ \n python libvirt-test-api.py -m TESTONE.XML TESTTWO.XML \ \n python libvirt-test-api.py -d TEST.XML TESTRUNID TESTID \ \n python libvirt-test-api.py -d TEST.XML TESTRUNID \ @@ -215,6 +217,41 @@ class Main(object): return 1 return 0 + def print_casefile(self, testcases): + """print testcase file template""" + modcasename = [] + for case in testcases: + if not os.path.isfile(case) or not case.endswith('.py'): + print "testcase %s couldn't be recognized" % case + return 1 + + paths = case.split('/') + modcasename.append(paths[1] + ':' + paths[2][:-3]) + + proxy_obj = proxy.Proxy(modcasename) + case_params = proxy_obj.get_params_variables() + + string = "# the file is generated automatically, please\n" \ + "# make some modifications before the use of it\n" \ + "# params in [] are optional to its testcase\n" + for key in modcasename: + string += "%s\n" % key + required_params, optional_params = case_params[key] + for p in required_params: + string += " " * 4 + p + "\n" + string += " " * 8 + p.upper() + "\n" + for p in optional_params: + string += " " * 4 + "[" + p + "]\n" + string += " " * 8 + p.upper() + "\n" + + if proxy_obj.has_clean_function(key): + string += "clean\n" + + string += "\n" + + print string + return 0 + def remove_log(self, testrunid, testid = None): """ to remove log item in the log xmlfile """ log_xml_parser = LogXMLParser(self.logxml) @@ -274,8 +311,8 @@ if __name__ == "__main__": loglevel = 0 try: - opts, args = getopt.getopt(sys.argv[1:], "hc:l:dmr", - ["help", "casefile=", "logxml=", + opts, args = getopt.getopt(sys.argv[1:], "hc:tl:dmr", + ["help", "casefile=", "template", "logxml=", "delete-log=", "merge=", "rerun="]) except getopt.GetoptError, err: print str(err) @@ -288,6 +325,14 @@ if __name__ == "__main__": sys.exit(0) if o == "-c" or o == "--casefile": casefile = v + if o == "-t" or o == "--template": + if len(args) <= 0: + usage() + sys.exit(1) + main = Main('', '', '', '') + if main.print_casefile(args): + sys.exit(1) + sys.exit(0) if o == "-f" or o == "--logxml": logxml = v if o == "-l" or o == "--log-level": diff --git a/proxy.py b/proxy.py index fdbffd9..bc82a84 100644 --- a/proxy.py +++ b/proxy.py @@ -120,6 +120,23 @@ class Proxy(object): ("required_params or optional_params not found in %s" % testcase_name) return case_params + def has_clean_function(self, testcase_name): + """ Return true if the testcase have clean function + """ + if testcase_name not in self.testcases_names: + return False + + elements = testcase_name.split(':') + casename = elements[1] + func = casename + '_clean' + + casemod_ref = self.testcase_ref_dict[testcase_name] + var_func_names = dir(casemod_ref) + + if func in var_func_names: + return True + return False + def get_call_dict(self, module, casename, func = None): """ Return testing function reference dictionary """ case_abs_path = '%s.%s.%s' % ('repos', module, casename) -- 1.7.7.5

2 3

[libvirt] [test-API PATCH 0/3] make clean function optional
by Guannan Ren 16 Apr '12

16 Apr '12

The set of patches is to make the writing of clean function optional. If a testcase which doesn't dirty the testing environment, then the TESTCASE_clean function could be optional or omitted. Because loggers in python are static objects managed by the module itself. When you create one, it won't be removed until the shell quit. In test-API there are two loggers which are configured with two handlers for each. we need to find a way to destruct these two loggers in order no to affect other application. The idea is to clear the handlers of each logger in destructor of CaseLog and EnvLog. def __del__(self): self.logger.handlers = [] rename some unclear function and variables. for example: repos/domain/start.py domain -> mod start.py -> case start() -> func

2 9

[libvirt] [test-API PATCH 0/5] add TESTCASE_check optional function support
by Guannan Ren 16 Apr '12

16 Apr '12

In some cases, we need to check if the testing environment is satisfied to run a certain testcase. The testcase only will be executed If some specific hardware is present on box. The patches add a optional check function support. For example: a testcase named testa.py with testa_check() defined in this file. The framework will run test_check(params) first, return 0 means pass, 1 means failure. If the check function failed. the testa(params) will not be run. "Skip" is marked in output. # testa.py required_params = () optional_params = ('options') def testa_check(params): logger = params['logger'] logger.info("I am from testa_check") return 1 def testa(params): logger = params['logger'] logger.info("I am from testa") return 1 The Output: Checking Testing Environment... Linux localhost.localdomain 3.2.5-3.fc16.x86_64 #1 SMP Thu Feb 9 01:24:38 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux Virsh command line tool of libvirt: 0.9.10 libvirtd (libvirt) 0.9.10 Default URI: qemu:///system QEMU emulator version 0.15.0 (qemu-kvm-0.15.0), Copyright (c) 2003-2008 Fabrice Bellard Start Testing: Case Count: 1 Log File: log/20120416142755/libvirt_test001 test:testa 14:27:56|INFO |I am from testa_check 14:27:56|INFO |Failed to meet testing requirement Result: Skip Summary: Total:1 [Pass:0 Fail:0 Skip:1] The testcase.conf file: test:testa options value1

1 5

[libvirt] [PATCH] Web placeholder for pending patches on the web site
by Daniel Veillard 16 Apr '12

16 Apr '12

This is based on recent developments on patch checker and the goal is to keep a list of pending patches needing review on the project web site. The page template in git just hold a pointer to the web page. diff --git a/docs/pending.html.in b/docs/pending.html.in new file mode 100644 index 0000000..dfbe647 --- /dev/null +++ b/docs/pending.html.in @@ -0,0 +1,13 @@ +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>Pending patches needing review</title> + </head> + <body> + <h1>Pending patches needing review</h1> + <p> A list of pending patches needing review upstream is available + on <a href="http://libvirt.org/pending.html">the project pending + patches page</a>.</p> + </body> +</html> + diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 1de2b20..8f58d46 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -332,6 +332,10 @@ <a href="todo.html">Todo list</a> <span>Main feature request list</span> </li> + <li> + <a href="pending.html">Pending patches</a> + <span>Pending patches awaiting reviews and integration</span> + </li> </ul> </li> <li> -- 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/

3 5