- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: Honor reedit opts printing to a function
by Michal Privoznik 13 Jun '12

13 Jun '12

When printing reedit options we make stdin raw. However, this results in stdout being raw as well. Therefore we need to return carriage when doing new line. Unfortunately, '\r' cannot be part of internationalized messages hence we must move them to formatting string which then in turn become huge and disarranged. To solve this, a new function is introduced which takes variable string arguments and prepend each with "\r\n" just before printing. --- tools/virsh.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 90ea43d..6840b92 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -655,6 +655,21 @@ vshReconnect(vshControl *ctl) ctl->useSnapshotOld = false; } +static void +vshPrintRaw(vshControl *ctl, ...) +{ + va_list ap; + char *key; + + va_start(ap, ctl); + while ((key = va_arg(ap, char *)) != NULL) { + vshPrint(ctl, "\r\n%s", key); + } + vshPrint(ctl, "\r\n"); + + va_end(ap); +} + /** * vshAskReedit: * @msg: Question to ask user @@ -690,10 +705,12 @@ vshAskReedit(vshControl *ctl, const char *msg) c = c_tolower(getchar()); if (c == '?') { - vshPrint(ctl, "\r\n%s", _("y - yes, start editor again\n" - "n - no, throw away my changes\n" - "f - force, try to redefine again\n" - "? - print this help\n")); + vshPrintRaw(ctl, + _("y - yes, start editor again"), + _("n - no, throw away my changes"), + _("f - force, try to redefine again"), + _("? - print this help"), + NULL); continue; } else if (c == 'y' || c == 'n' || c == 'f') { break; -- 1.7.8.5

2 1

[libvirt] [RFC] Filtering SG_IO commands using cgroups
by Paolo Bonzini 13 Jun '12

13 Jun '12

While we wait for Al's answer, it seems to me that filtering CDBs with cgroups is a pretty natural extension of filtering devices with cgroups. So here is a possible specification for such a cgroup. [CCing the libvirt mailing list since they could be one of the first clients] Paolo SG_IO Filter Controller ("cdb") 1. Description The cdb cgroup implement a way to filter allowed SCSI commands according to one or more Berkeley Packet Filter programs associated to the cgroup and its parents. BPF programs have access to the CDB and various ancillary data about the device. To be allowed, a command must be allowed by at least one program for each cgroup from the current task's to the root. In addition, as a general rule it must pass the regular check on privileged commands that is done even without cgroups. Groups with no programs are handled specially so that the default configuration is the same as without cgroups. Privileged tasks may install programs that bypass the usual check on "dangerous" SCSI commands. Non-privileged tasks in the same cgroup will also be able to bypass the check, but they may not widen their privileged abilities beyond what the cgroup already has. Administrators can replace the current entries, or add new ones. Replacing the entries in a cgroup will never affect those that are inherited from the parent. However when a parent cgroup is changed, the new filters will also apply to the children. 2. Operation The BPF program can return one of the following values: * 0: the CDB is denied. Another program in the cgroup will be tried, or the SG_IO ioctl will return with EPERM if there are none. * 1: the CDB is allowed; it should be subject to the bitmap that is used in the absence of cgroups. * 2: the CDB is allowed, and the generic filter may be bypassed. Programs that return 2 or the value of the accumulator are called privileged in the remainder of this document. BPF programs used with the cdb cgroup have access to the following ancillary values: * ANC_MAJOR (45): the major number of the device * ANC_MINOR (46): the minor number of the device * ANC_BLOCK (47): 1 if the device is a block device, 0 if it is a character device * ANC_PART (48): the partition number of the device; 0 if it is a character device * ANC_MODE (49): one of O_RDONLY/O_WRONLY/O_RDWR depending on how the file was opened. * ANC_RAWIO (50): 1 if the current process has CAP_SYS_RAWIO, 0 otherwise. Evaluation goes through all filters in each cgroup and picks the most permissive (largest) value. It also goes through all cgroups from the current task's up to the root, and executes filters in there; but here it picks the most restrictive value. In other words the result from multiple filters is "ORed", while the result from multiple cgroups is "ANDed". Cgroups with no filters are skipped, with one exception: if the current task is in a cgroup with no filters, it will behave as if it had this special filter: pseudocode: | BPF: if capable(CAP_SYS_RAWIO) | ANC RAWIO return 2 | ADD #1 else | RET A return 1 | This has two effects: 1) when a non-privileged task is moved from a privileged cgroup to a new cgroup, it will be subject to the generic filter; 2) when a task is in the root cgroup, and the root cgroup has no filters, it behaves as if the cdb cgroup did not exist at all. This maps to the following algorithm: privileged = YES allowed = YES for each cgroup C from the current task cdb cgroup to the root if no filters in C if C is the current task cdb cgroup privileged &= capable(CAP_SYS_RAWIO) continue privileged_this_cgroup = NO allowed_this_cgroup = NO for each filter F in C ret = run_filter(F, cdb) if ret != 0 then allowed_this_cgroup = YES if ret == 2 then privileged_this_cgroup = YES privileged &= privileged_this_cgroup allowed &= allowed_this_cgroup if !allowed then return EPERM if !privileged then test CDB against bitmap execute CDB (Of course some short-circuiting is possible). 3. User Interface The cgroup provides three files: * cdb.filter: entries are modified using this file. Entries are added if the file was opened with O_APPEND, otherwise they are replaced. Opening the file with O_TRUNC immediately removes all filters. These rules are chosen so that shell redirections (including ":>cdb.filter") will do the right thing. Adding or replacing programs requires CAP_SYS_ADMIN. Adding privileged programs *in addition* requires CAP_SYS_RAWIO. An entry is represented by multiple occurrences of the following structure, which must all be written with a single system call: struct bpf_insn { u16 code; u8 jt; u8 jf; u32 k; }; in the native endianness of the running architecture. A zero-length write will do nothing if the file was opened with O_APPEND, and remove all entries if it wasn't. * cdb.list: entries are retrieved using this file. All filters are preceded by a 32-bit value counting the number of bpf_insn structs in the program, and concatenated. * cdb.priv: returns 1 if the cgroup is privileged (has at least one privileged filter). This is true if at least one filter includes a "RET #2" or "RET A" instruction. 4. Security Filters that include the "RET A" or "RET #2" instructions can only be added by a task that has CAP_SYS_RAWIO; thus only tasks with CAP_SYS_RAWIO, who could bypass the bitmap themselves, can also let other processes do so. Such cgroups are marked as privileged; CAP_SYS_RAWIO is required to attach a process to a privileged cgroup. The privileged status is visible in the "cdb.priv" file. While such filters let non-privileged processes and their children bypass the bitmap, this only holds as long as the non-privileged process does none of the following operations (which by themselves require CAP_SYS_ADMIN): * replace all filters from the cgroup * create a new sub-cgroup and move itself to it Because in either case, the empty cgroup will behave as if it had "RET #1". In addition, new filters added to the cgroup will never widen the privileged abilities of the process, because filters with "RET #2" or "RET A" will not be allowed. 5. Examples of filters 5.1. Persistent reservations This filter lets a program use persistent reservations, plus any other command that is allowed without CAP_SYS_RAWIO: LD_B 0 ; A = cdb[0] JGT #0x5f, Lpass, 1f ; pass if > PR OUT 1: JGE #0x5e, Lpr, Lpass ; pass if < PR IN Lpass: RET #1 ; go to bitmap check Lpr: RET #2 ; bypass bitmap check A program could put itself in a new cgroup, add this filter and then drop CAP_SYS_RAWIO/CAP_SYS_ADMIN. 5.2. Arbitrary bitmap This filter could be used as a template to convert a 256-bit bitmap to a BPF program. LD_B 0 AND #31 TAX ; X = cdb[0] & 31 LD #1 LSH X TAX ; X = 1 << (cdb[0] & 31) LD_B 0 ; A = cdb[0] JSET #128, L1xx, L0xx ; Decode bit 7 of the opcode L0xx: JSET #64, L01x, L00x ; Decode bit 6 L1xx: JSET #64, L11x, L10x L00x: JSET #32, L001, L000 ; Decode bit 5 L01x: JSET #32, L011, L010 L10x: JSET #32, L101, L100 L11x: JSET #32, L111, L110 L000: TXA; JSET #..., Lpass, Lfail ; fill in bitmap values here L001: TXA; JSET #..., Lpass, Lfail L010: TXA; JSET #..., Lpass, Lfail L011: TXA; JSET #..., Lpass, Lfail L100: TXA; JSET #..., Lpass, Lfail L101: TXA; JSET #..., Lpass, Lfail L110: TXA; JSET #..., Lpass, Lfail L111: TXA; JSET #..., Lpass, Lfail Lpass: RET #1 ; could also be RET #2 Lfail: RET #0

1 0

[libvirt] [PATCH] build: silence gettext warning
by Eric Blake 13 Jun '12

13 Jun '12

Otherwise, 'make dist' gives multiple warnings like: libvirt.pot:20814: warning: internationalized messages should not contain the `\r' escape sequence * tools/virsh.c (vshAskReedit): Avoid \r in _(). --- Pushing under the trivial rule. tools/virsh.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 744b629..90ea43d 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -690,10 +690,10 @@ vshAskReedit(vshControl *ctl, const char *msg) c = c_tolower(getchar()); if (c == '?') { - vshPrint(ctl, "\r\n%s", _("y - yes, start editor again\r\n" - "n - no, throw away my changes\r\n" - "f - force, try to redefine again\r\n" - "? - print this help\r\n")); + vshPrint(ctl, "\r\n%s", _("y - yes, start editor again\n" + "n - no, throw away my changes\n" + "f - force, try to redefine again\n" + "? - print this help\n")); continue; } else if (c == 'y' || c == 'n' || c == 'f') { break; -- 1.7.10.2

2 1

[libvirt] [PATCH 1/2] drop the removed module check
by Wanlong Gao 13 Jun '12

13 Jun '12

check.py has been dropped and functions moved into utils.py. Signed-off-by: Wanlong Gao <gaowanlong(a)cn.fujitsu.com> --- repos/domain/balloon_memory.py | 1 - 1 file changed, 1 deletion(-) diff --git a/repos/domain/balloon_memory.py b/repos/domain/balloon_memory.py index 5879d15..7051a0a 100644 --- a/repos/domain/balloon_memory.py +++ b/repos/domain/balloon_memory.py @@ -13,7 +13,6 @@ from libvirt import libvirtError from src import sharedmod from utils import utils -from utils import check required_params = ('guestname', 'memorypair',) optional_params = {} -- 1.7.11.rc0

2 10

[libvirt] make dist failed
by Wen Congyang 13 Jun '12

13 Jun '12

make dist failed with the following error: make[1]: Entering directory `/home/wency/source/libvirt/src' GEN rpc/virnetprotocol.h GEN rpc/virnetprotocol.c GEN rpc/virkeepaliveprotocol.h GEN rpc/virkeepaliveprotocol.c GEN remote/remote_protocol.h GEN remote/remote_protocol.c GEN remote/qemu_protocol.h GEN remote/qemu_protocol.c GEN remote/qemu_client_bodies.h GEN util/virkeymaps.h CC libvirt_driver_remote_la-remote_protocol.lo In file included from ./remote/remote_protocol.h:17, from ./remote/remote_protocol.c:7: ./internal.h:300:31: error: libvirt_probes.h: No such file or directory

3 11

Re: [libvirt] Error while installing a guest
by Pankaj Rawat 13 Jun '12

13 Jun '12

#qemu-img info /var/lib/libvirt/images/g2 image: /var/lib/libvirt/images/g2 file format: qcow2 virtual size: 8.0G (8589934592 bytes) disk size: 136K cluster_size: 65536 [root@localhost libvirt-0.9.11]# ifconfig | grep br0 br0 Link encap:Ethernet HWaddr 00:1A:4B:B9:E2:50 virbr0 Link encap:Ethernet HWaddr C6:F4:2E:7A:4C:25 I tried prompt option but it does'nt work # /usr/sbin/virt-install --accelerate --hvm --connect qemu:///system --name g3 --vcpu=1 --ram 1024 --os-type=linux --os-variant=rhel6 --network bridge:br0 --disk /var/lib/libvirt/images/g2 --disk=/opt/SL-62-x86_64-2012-02-06-Install-DVD.iso,device=cdrom,perms=ro --location=/mnt/ --nographics --serial pty --extra-args=console=ttyS0,115200n8 --keymap=en --force --prompt Starting install... Retrieving file .treeinfo... | 768 B 00:00 ... Retrieving file vmlinuz... | 7.5 MB 00:00 ... Retrieving file initrd.img... | 59 MB 00:00 ... ERROR internal error Process exited while reading console log output: Domain installation does not appear to have been successful. If it was, you can restart your domain by running: virsh --connect qemu:///system start g3 otherwise, please restart your installation. On 06/12/2012 05:55 PM, Pankaj Rawat wrote: Ok I am attaching the file. Please check your guest image size by qemu-img info or ll -h, for example: qemu-img info /var/lib/libvirt/images/g2, and run 'ifconfig | grep br0' then paste output in here, thanks. In addition, you may also use interactive virt-install to install a guest with --prompt option then step by step. Regards Pankaj Rawat -----Original Message----- From: Alex Jia [mailto:a...@redhat.com] Sent: Tuesday, June 12, 2012 11:38 AM To: Pankaj Rawat Cc: libvir-list(a)redhat.com Subject: Re: [libvirt] Error while installing a guest Hi Pankaj, Could you attach your virt-install.log as an attachment? it locals in ~/.virtinst/virt-install.log. Or Is it okay if you also upgrade your python-virtinst? Thanks, Alex ----- Original Message ----- From: "Pankaj Rawat" <pankaj.ra...(a)nechclst.in> To: libvir-list(a)redhat.com Sent: Tuesday, June 12, 2012 1:56:05 PM Subject: [libvirt] Error while installing a guest Hi all , I have SL6.2 x86_64 Installed on my system I updated libvirt version from 0.9.4 to 0.9.11, I had removed previous libvirt via yum I done this by compiling the source. I started libvirt daemon created by compiling source : # ./root/libvirt_0.9.11/build/daomen/libvirtd Now I tried to create a guest:- [root@localhost libvirt-0.9.11]# /usr/sbin/virt-install --accelerate --hvm --connect qemu:///system --name g3 --vcpu=1 --ram 1024 --os-type=linux --os-variant=rhel6 --network bridge:br0 --disk /var/lib/libvirt/images/g2 --disk=/opt/SL-62-x86_64-2012-02-06-Install-DVD.iso,device=cdrom,perms=ro --location=/mnt/ --nographics --serial pty --extra-args=console=ttyS0,115200n8 --keymap=en --force The command line above normally works fine (I have created many vm by using same above command) But here Following error comes Starting install... Retrieving file .treeinfo... | 768 B 00:00 ... Retrieving file vmlinuz... | 7.5 MB 00:00 ... Retrieving file initrd.img... 100% [=====================================================] 11 MB/s | 29 MB --:-- ETA Retrieving file initrd.img... | 59 MB 00:09 ... ERROR internal error Process exited while reading console log output: Domain installation does not appear to have been successful. If it was, you can restart your domain by running: virsh --connect qemu:///system start g3 otherwise, please restart your installation. at libvirtd console following output comes: 2012-06-12 13:58:55.239+0000: 17800: error : qemuProcessReadLogOutput:1298 : internal error Process exited while reading console log output: 2012-06-12 14:04:12.120+0000: 17802: warning : qemuDomainObjTaint:1227 : Domain id=3 name='g3' uuid=fec6cb5a-d4ea-d2c9-505c-611227fb4f4c is tainted: high-privileges 2012-06-12 13:58:55.239+0000: 17800: error : qemuProcessReadLogOutput:1298 : internal error Process exited while reading console lo I dont know how to resolve this . Regards Pankaj Rawat DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . ----------------------------------------------------------------------------------------------------------------------- -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

2 1

[libvirt] [sandbox][PATCH] config: select specific kernel
by Radu Caragea 12 Jun '12

12 Jun '12

Added parameters to select a kernel through the release version and path to binary. When setting kernel release version, the module search will be done in /lib/modules/<release>/kernel . Also, by default, after setting the kernel release version the default kernel image path will be /boot/vmlinuz-<release> The two default to the running configuration: /lib/modules/`uname -r`/kernel and /boot/vmlinuz-`uname -r` kver didn't seem suggestive enough; I used kernrelease and kernpath. To be changed if necessary. Also removed utsname inclusion wherever it wasn't used at all anymore diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c index 7087459..3f7c5d7 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -22,7 +22,6 @@ #include <config.h> #include <string.h> -#include <sys/utsname.h> #include "libvirt-sandbox/libvirt-sandbox.h" @@ -116,7 +115,6 @@ static void gvir_sandbox_builder_machine_finalize(GObject *object) static gchar *gvir_sandbox_builder_machine_mkinitrd(GVirSandboxConfig *config, - const gchar *kver, GError **error) { GVirSandboxConfigInitrd *initrd = gvir_sandbox_config_initrd_new(); @@ -124,7 +122,7 @@ static gchar *gvir_sandbox_builder_machine_mkinitrd(GVirSandboxConfig *config, gchar *targetfile = g_strdup_printf("/tmp/libvirt-sandbox-initrd-XXXXXX"); int fd = -1; - gvir_sandbox_config_initrd_set_kver(initrd, kver); + gvir_sandbox_config_initrd_set_kver(initrd, gvir_sandbox_config_get_kernrelease(config)); gvir_sandbox_config_initrd_set_init(initrd, LIBEXECDIR "/libvirt-sandbox-init-qemu"); gvir_sandbox_config_initrd_add_module(initrd, "fscache.ko"); @@ -341,19 +340,16 @@ static gboolean gvir_sandbox_builder_machine_construct_os(GVirSandboxBuilder *bu gchar *kernel = NULL; gchar *initrd = NULL; gchar *cmdline = NULL; - struct utsname uts; GVirConfigDomainOs *os; if (!GVIR_SANDBOX_BUILDER_CLASS(gvir_sandbox_builder_machine_parent_class)-> construct_os(builder, config, configdir, cleaner, domain, error)) return FALSE; - uname(&uts); - - if (!(initrd = gvir_sandbox_builder_machine_mkinitrd(config, uts.release, error))) + if (!(initrd = gvir_sandbox_builder_machine_mkinitrd(config, error))) return FALSE; - kernel = g_strdup_printf("/boot/vmlinuz-%s", uts.release); + kernel = g_strdup(gvir_sandbox_config_get_kernpath(config)); cmdline = gvir_sandbox_builder_machine_cmdline(config); gvir_sandbox_cleaner_add_rmfile_post_start(cleaner, diff --git a/libvirt-sandbox/libvirt-sandbox-config-initrd.c b/libvirt-sandbox/libvirt-sandbox-config-initrd.c index 327e0bf..5c75fce 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-initrd.c +++ b/libvirt-sandbox/libvirt-sandbox-config-initrd.c @@ -22,7 +22,6 @@ #include <config.h> #include <string.h> -#include <sys/utsname.h> #include "libvirt-sandbox/libvirt-sandbox.h" @@ -161,12 +160,8 @@ static void gvir_sandbox_config_initrd_class_init(GVirSandboxConfigInitrdClass * static void gvir_sandbox_config_initrd_init(GVirSandboxConfigInitrd *config) { GVirSandboxConfigInitrdPrivate *priv = config->priv; - struct utsname uts; priv = config->priv = GVIR_SANDBOX_CONFIG_INITRD_GET_PRIVATE(config); - priv->init = g_strdup(LIBEXECDIR "/libvirt-sandbox-init-qemu"); - uname(&uts); - priv->kver = g_strdup(uts.release); } diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-address.c b/libvirt-sandbox/libvirt-sandbox-config-network-address.c index ad91f77..959bf94 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-address.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-address.c @@ -22,7 +22,6 @@ #include <config.h> #include <string.h> -#include <sys/utsname.h> #include "libvirt-sandbox/libvirt-sandbox.h" diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-route.c b/libvirt-sandbox/libvirt-sandbox-config-network-route.c index 7962352..6c473d0 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-route.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-route.c @@ -22,7 +22,6 @@ #include <config.h> #include <string.h> -#include <sys/utsname.h> #include "libvirt-sandbox/libvirt-sandbox.h" diff --git a/libvirt-sandbox/libvirt-sandbox-config-network.c b/libvirt-sandbox/libvirt-sandbox-config-network.c index 5668274..6440642 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network.c @@ -22,7 +22,6 @@ #include <config.h> #include <string.h> -#include <sys/utsname.h> #include "libvirt-sandbox/libvirt-sandbox.h" diff --git a/libvirt-sandbox/libvirt-sandbox-config.c b/libvirt-sandbox/libvirt-sandbox-config.c index 2b0a9be..b9cda3d 100644 --- a/libvirt-sandbox/libvirt-sandbox-config.c +++ b/libvirt-sandbox/libvirt-sandbox-config.c @@ -46,6 +46,8 @@ struct _GVirSandboxConfigPrivate gchar *name; gchar *root; gchar *arch; + gchar *kernrelease; + gchar *kernpath; gboolean shell; guint uid; @@ -72,6 +74,8 @@ enum { PROP_ROOT, PROP_ARCH, PROP_SHELL, + PROP_KERNRELEASE, + PROP_KERNPATH, PROP_UID, PROP_GID, @@ -123,6 +127,14 @@ static void gvir_sandbox_config_get_property(GObject *object, g_value_set_string(value, priv->arch); break; + case PROP_KERNRELEASE: + g_value_set_string(value, priv->kernrelease); + break; + + case PROP_KERNPATH: + g_value_set_string(value, priv->kernpath); + break; + case PROP_SHELL: g_value_set_boolean(value, priv->shell); break; @@ -181,6 +193,16 @@ static void gvir_sandbox_config_set_property(GObject *object, priv->arch = g_value_dup_string(value); break; + case PROP_KERNRELEASE: + g_free(priv->kernrelease); + priv->kernrelease = g_value_dup_string(value); + break; + + case PROP_KERNPATH: + g_free(priv->kernpath); + priv->kernpath = g_value_dup_string(value); + break; + case PROP_SHELL: priv->shell = g_value_get_boolean(value); break; @@ -239,6 +261,8 @@ static void gvir_sandbox_config_finalize(GObject *object) g_free(priv->name); g_free(priv->root); g_free(priv->arch); + g_free(priv->kernrelease); + g_free(priv->kernpath); g_free(priv->secLabel); G_OBJECT_CLASS(gvir_sandbox_config_parent_class)->finalize(object); @@ -291,6 +315,28 @@ static void gvir_sandbox_config_class_init(GVirSandboxConfigClass *klass) G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); g_object_class_install_property(object_class, + PROP_KERNRELEASE, + g_param_spec_string("kernrelease", + "Kernrelease", + "The kernel release version", + NULL, + G_PARAM_READABLE | + G_PARAM_WRITABLE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + g_object_class_install_property(object_class, + PROP_KERNPATH, + g_param_spec_string("kernpath", + "Kernpath", + "The kernel image path", + NULL, + G_PARAM_READABLE | + G_PARAM_WRITABLE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + g_object_class_install_property(object_class, PROP_SHELL, g_param_spec_string("shell", "SHELL", @@ -388,6 +434,8 @@ static void gvir_sandbox_config_init(GVirSandboxConfig *config) priv->name = g_strdup("sandbox"); priv->root = g_strdup("/"); priv->arch = g_strdup(uts.machine); + priv->kernrelease = g_strdup(uts.release); + priv->kernpath = g_strdup_printf("/boot/vmlinuz-%s", priv->kernrelease); priv->secLabel = g_strdup("system_u:system_r:svirt_t:s0:c0.c1023"); priv->uid = geteuid(); @@ -474,6 +522,70 @@ const gchar *gvir_sandbox_config_get_arch(GVirSandboxConfig *config) /** + * gvir_sandbox_config_set_kernrelease: + * @config: (transfer none): the sandbox config + * @kernrelease: (transfer none): the host directory + * + * Set the kernel release version to use in the sandbox. If none is provided, + * it will default to matching the current running kernel. + * Also sets the default kernel path as /boot/vmlinuz-<release> + */ +void gvir_sandbox_config_set_kernrelease(GVirSandboxConfig *config, const gchar *kernrelease) +{ + GVirSandboxConfigPrivate *priv = config->priv; + g_free(priv->kernrelease); + priv->kernrelease = g_strdup(kernrelease); + gvir_sandbox_config_set_kernpath(config, g_strdup_printf("/boot/vmlinuz-%s", priv->kernrelease)); + +} + + +/** + * gvir_sandbox_config_get_kernrelease: + * @config: (transfer none): the sandbox config + * + * Retrieves the sandbox kernel release version + * + * Returns: (transfer none): the current kernel release version + */ +const gchar *gvir_sandbox_config_get_kernrelease(GVirSandboxConfig *config) +{ + GVirSandboxConfigPrivate *priv = config->priv; + return priv->kernrelease; +} +/** + * gvir_sandbox_config_set_kernpath: + * @config: (transfer none): the sandbox config + * @kernpath: (transfer none): the host directory + * + * Set the kernel image path to use in the sandbox. If none is provided, + * it will default to matching /boot/vmlinuz-<kernel release>. + */ + +void gvir_sandbox_config_set_kernpath(GVirSandboxConfig *config, const gchar *kernpath) +{ + GVirSandboxConfigPrivate *priv = config->priv; + g_free(priv->kernpath); + priv->kernpath = g_strdup(kernpath); +} + + +/** + * gvir_sandbox_config_get_kernpath: + * @config: (transfer none): the sandbox config + * + * Retrieves the sandbox kernel image path + * + * Returns: (transfer none): the current kernel image path + */ +const gchar *gvir_sandbox_config_get_kernpath(GVirSandboxConfig *config) +{ + GVirSandboxConfigPrivate *priv = config->priv; + return priv->kernpath; +} + + +/** * gvir_sandbox_config_set_shell: * @config: (transfer none): the sandbox config * @shell: (transfer none): true if the container should have a shell @@ -1531,6 +1643,14 @@ static gboolean gvir_sandbox_config_load_config(GVirSandboxConfig *config, g_free(priv->arch); priv->arch = str; } + if ((str = g_key_file_get_string(file, "core", "kernrelease", NULL)) != NULL) { + g_free(priv->kernrelease); + priv->kernrelease = str; + } + if ((str = g_key_file_get_string(file, "core", "kernpath", NULL)) != NULL) { + g_free(priv->kernpath); + priv->kernpath = str; + } b = g_key_file_get_boolean(file, "core", "shell", &e); if (e) { g_error_free(e); @@ -1748,6 +1868,8 @@ static void gvir_sandbox_config_save_config(GVirSandboxConfig *config, g_key_file_set_string(file, "core", "name", priv->name); g_key_file_set_string(file, "core", "root", priv->root); g_key_file_set_string(file, "core", "arch", priv->arch); + g_key_file_set_string(file, "core", "kernrelease", priv->kernrelease); + g_key_file_set_string(file, "core", "kernpath", priv->kernpath); g_key_file_set_boolean(file, "core", "shell", priv->shell); g_key_file_set_uint64(file, "identity", "uid", priv->uid); diff --git a/libvirt-sandbox/libvirt-sandbox-config.h b/libvirt-sandbox/libvirt-sandbox-config.h index 3902e40..a6c8ae8 100644 --- a/libvirt-sandbox/libvirt-sandbox-config.h +++ b/libvirt-sandbox/libvirt-sandbox-config.h @@ -76,6 +76,12 @@ const gchar *gvir_sandbox_config_get_root(GVirSandboxConfig *config); void gvir_sandbox_config_set_arch(GVirSandboxConfig *config, const gchar *arch); const gchar *gvir_sandbox_config_get_arch(GVirSandboxConfig *config); +void gvir_sandbox_config_set_kernrelease(GVirSandboxConfig *config, const gchar *kernrelease); +const gchar *gvir_sandbox_config_get_kernrelease(GVirSandboxConfig *config); + +void gvir_sandbox_config_set_kernpath(GVirSandboxConfig *config, const gchar *kernpath); +const gchar *gvir_sandbox_config_get_kernpath(GVirSandboxConfig *config); + void gvir_sandbox_config_set_shell(GVirSandboxConfig *config, gboolean shell); gboolean gvir_sandbox_config_get_shell(GVirSandboxConfig *config); diff --git a/libvirt-sandbox/libvirt-sandbox.sym b/libvirt-sandbox/libvirt-sandbox.sym index 16cd2ff..424fd98 100644 --- a/libvirt-sandbox/libvirt-sandbox.sym +++ b/libvirt-sandbox/libvirt-sandbox.sym @@ -94,6 +94,8 @@ LIBVIRT_SANDBOX_0.0.1 { gvir_sandbox_config_set_root; gvir_sandbox_config_set_shell; gvir_sandbox_config_set_arch; +gvir_sandbox_config_set_kernrelease; +gvir_sandbox_config_set_kernpath; gvir_sandbox_config_set_userid; gvir_sandbox_config_set_groupid; gvir_sandbox_config_set_username;

2 1

[libvirt] [PATCH 0/5] Support forward mode='hostdev' and interface pools
by Shradha Shah 12 Jun '12

12 Jun '12

This patch series supports the forward mode='hostdev'. The functionality of this mode is the same as interface type='hostdev' but with the added benefit of using interface pools. The patch series also contains a patch to support use of interface names and PCI device addresses interchangeably in a network xml, and return the appropriate one in actualDevice when networkAllocateActualDevice is called. This functionality is not supported for any other forward mode except hostdev. Currently this patch series also does not support USB hostdev passthrough. At the top level managed attribute can be specified for a pf dev or an interface dev (with identical results as when it's specified for a hostdev Shradha Shah (5): Code to return interface name or pci_addr of the VF in actualDevice Moved the code to create implicit interface pool from PF to a new function Introduce forward mode='hostdev' for network XML in order to use the functionality of interface pools. Forward Mode Hostdev Implementation Supporting managed option for forward devs when using HOSTDEV mode docs/schemas/network.rng | 1 + src/conf/network_conf.c | 119 +++++++++++++++- src/conf/network_conf.h | 13 ++- src/libvirt_private.syms | 3 + src/network/bridge_driver.c | 325 +++++++++++++++++++++++++++++++++++-------- src/qemu/qemu_command.c | 14 ++ src/util/pci.c | 7 +- src/util/pci.h | 3 + src/util/virnetdev.c | 134 +++++++++++++++++- src/util/virnetdev.h | 19 +++ 10 files changed, 568 insertions(+), 70 deletions(-) -- 1.7.4.4

3 14

[libvirt] [PATCHv2 0/3] openvz: allow for runtime quota updates
by Guido Günther 12 Jun '12

12 Jun '12

Hi, attached patches allow to change disk quota at runtime. This can later be extended to update network configuration as well. The patch revealed a problem of the openvz driver in genral: the openvzLoadDomains only reads the on disk configuration but doesn't check if running domains have (non persistent) diverging values due to openvz calls without the "--save" option but that's part of another patch. Changes since last time: * add virDomainFSIndexByName to libvirt_private.syms * check for unallowed updates in openvzUpdateDevice Cheers, -- Guido Guido Günther (3): Introduce virDomainFSIndexByName openvz: add persist parameter to openvzSetDiskQuota openvz: wire up domainUpdateDeviceFlags src/conf/domain_conf.c | 16 ++++++ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/openvz/openvz_driver.c | 116 ++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 130 insertions(+), 4 deletions(-) -- 1.7.10.4

2 6

[libvirt] [sandbox][PATCH]builder-machine: fix incorrect memory allocation
by Radu Caragea 12 Jun '12

12 Jun '12

Features should be allocated with 2 elements, one to be "acpi" and one to be a NULL pointer indicating string array termination. (Caught with valgrind) diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c index 7087459..3f7c5d7 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -391,7 +387,7 @@ static gboolean gvir_sandbox_builder_machine_construct_features(GVirSandboxBuild construct_features(builder, config, configdir, cleaner, domain, error)) return FALSE; - features = g_new0(gchar *, 1); + features = g_new0(gchar *, 2); features[0] = g_strdup("acpi"); gvir_config_domain_set_features(domain, features); g_strfreev(features);

2 1

[libvirt] [PATCH 0/2] python bindings cleanups for snapshots
by Eric Blake 12 Jun '12

12 Jun '12

I noticed these while working on my new list all snapshots code, but these are fairly independent and can be applied in any order. Eric Blake (2): python: use simpler methods python: fix snapshot listing bugs python/libvirt-override.c | 70 ++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 27 deletions(-) -- 1.7.10.2

2 5

[libvirt] [libvirt-sandbox][PATCH] module lookup and rundir fix
by Radu C. 12 Jun '12

12 Jun '12

Hello, I've been trying to get libvirt-sandbox working on my Gentoo box but I ran into some difficulties. The version I'm using is the latest git one. The first problem was the following when running virt-sandbox: "Unable to start sandbox: Error opening file '/tmp/libvirt-sandbox-9ivpRN/9pnet.ko': File exists" I pinpointed the problem to the following diff in commit [05fb94d2c42abe9cfd86c3663d704c268f325503]: - gchar *moddirpath = g_strdup_printf("/lib/modules/%s/kernel", + gchar *moddirpath = g_strdup_printf("/lib/modules/%s", The problem is that symlinks are made to the build directory and it finds a module multiple times. I inserted a printf in the lookup loop so here's what I mean: dmns libvirt-sandbox # virt-sandbox -c qemu:///system -n test1323 -v -d /usr/bin/yes found: /lib/modules/3.4.0-gentoo/kernel/fs/fscache/fscache.ko found: /lib/modules/3.4.0-gentoo/source/fs/fscache/fscache.ko found: /lib/modules/3.4.0-gentoo/build/fs/fscache/fscache.ko found: /lib/modules/3.4.0-gentoo/kernel/net/9p/9pnet.ko found: /lib/modules/3.4.0-gentoo/source/net/9p/9pnet.ko found: /lib/modules/3.4.0-gentoo/build/net/9p/9pnet.ko found: /lib/modules/3.4.0-gentoo/kernel/fs/9p/9p.ko found: /lib/modules/3.4.0-gentoo/source/fs/9p/9p.ko found: /lib/modules/3.4.0-gentoo/build/fs/9p/9p.ko found: /lib/modules/3.4.0-gentoo/kernel/net/9p/9pnet_virtio.ko found: /lib/modules/3.4.0-gentoo/source/net/9p/9pnet_virtio.ko found: /lib/modules/3.4.0-gentoo/build/net/9p/9pnet_virtio.ko The next problem was the following: dmns libvirt-sandbox # virt-sandbox -c qemu:///system -n test123 -v -d /usr/bin/yes Unable to start sandbox: Failed to create domain: internal error Process exited while reading console log output: char device redirected to /dev/pts/1 char device redirected to /dev/pts/3 Virtio-9p Failed to initialize fs-driver with id:fsdev-fs1 and export path:libvirt-sandbox/test123/config It appears when running as root because of the following line: ./libvirt-sandbox/libvirt-sandbox-context.c: cachedir = (getuid() ? g_get_user_cache_dir() : RUNDIR); RUNDIR is always "" due to being compiled with -DRUNDIR=\"\" . This is because there's a typo in makefile.am Both of these are fixed in the diff attachment. Having these fixes in place everything works fine when using libvirt 0.9.10 but for newer versions I noticed every time I ran virt-sandbox the libvirtd daemon would segfault. Using git bisect I traced the problem back to commit [1]. So I reverted back to libvirt 0.9.10 but I believe there is a problem both in the commit and somewhere in libvirt-sandbox. Please have a look and tell me if you need extra info. [1] http://libvirt.org/git/?p=libvirt.git;a=commit;h=4716138229ae47c5492c13a862… Radu Caragea.

2 1

Re: [libvirt] Error while installing a guest
by Pankaj Rawat 12 Jun '12

12 Jun '12

I am attaching the virtinstall log file is attached Regards Pankaj Rawat From: Pankaj Rawat Sent: Tuesday, June 12, 2012 3:26 PM To: Alex Jia Cc: libvir-list(a)redhat.com Subject: RE: [libvirt] Error while installing a guest Ok I am attaching the file. Regards Pankaj Rawat -----Original Message----- From: Alex Jia [mailto:ajia@redhat.com] Sent: Tuesday, June 12, 2012 11:38 AM To: Pankaj Rawat Cc: libvir-list(a)redhat.com Subject: Re: [libvirt] Error while installing a guest Hi Pankaj, Could you attach your virt-install.log as an attachment? it locals in ~/.virtinst/virt-install.log. Or Is it okay if you also upgrade your python-virtinst? Thanks, Alex ----- Original Message ----- From: "Pankaj Rawat" <pankaj.rawat(a)nechclst.in> To: libvir-list(a)redhat.com Sent: Tuesday, June 12, 2012 1:56:05 PM Subject: [libvirt] Error while installing a guest Hi all , I have SL6.2 x86_64 Installed on my system I updated libvirt version from 0.9.4 to 0.9.11, I had removed previous libvirt via yum I done this by compiling the source. I started libvirt daemon created by compiling source : # ./root/libvirt_0.9.11/build/daomen/libvirtd Now I tried to create a guest:- [root@localhost libvirt-0.9.11]# /usr/sbin/virt-install --accelerate --hvm --connect qemu:///system --name g3 --vcpu=1 --ram 1024 --os-type=linux --os-variant=rhel6 --network bridge:br0 --disk /var/lib/libvirt/images/g2 --disk=/opt/SL-62-x86_64-2012-02-06-Install-DVD.iso,device=cdrom,perms=ro --location=/mnt/ --nographics --serial pty --extra-args=console=ttyS0,115200n8 --keymap=en --force The command line above normally works fine (I have created many vm by using same above command) But here Following error comes Starting install... Retrieving file .treeinfo... | 768 B 00:00 ... Retrieving file vmlinuz... | 7.5 MB 00:00 ... Retrieving file initrd.img... 100% [=====================================================] 11 MB/s | 29 MB --:-- ETA Retrieving file initrd.img... | 59 MB 00:09 ... ERROR internal error Process exited while reading console log output: Domain installation does not appear to have been successful. If it was, you can restart your domain by running: virsh --connect qemu:///system start g3 otherwise, please restart your installation. at libvirtd console following output comes: 2012-06-12 13:58:55.239+0000: 17800: error : qemuProcessReadLogOutput:1298 : internal error Process exited while reading console log output: 2012-06-12 14:04:12.120+0000: 17802: warning : qemuDomainObjTaint:1227 : Domain id=3 name='g3' uuid=fec6cb5a-d4ea-d2c9-505c-611227fb4f4c is tainted: high-privileges 2012-06-12 13:58:55.239+0000: 17800: error : qemuProcessReadLogOutput:1298 : internal error Process exited while reading console lo I dont know how to resolve this . Regards Pankaj Rawat DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . ----------------------------------------------------------------------------------------------------------------------- -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

1 0

Re: [libvirt] Error while installing a guest
by Alex Jia 12 Jun '12

12 Jun '12

On 06/12/2012 05:55 PM, Pankaj Rawat wrote: > > > Ok I am attaching the file. > Please check your guest image size by qemu-img info or ll -h, for example: qemu-img info /var/lib/libvirt/images/g2, and run 'ifconfig | grep br0' then paste output in here, thanks. In addition, you may also use interactive virt-install to install a guest with --prompt option then step by step. > > Regards > Pankaj Rawat > > > -----Original Message----- > From: Alex Jia [mailto:ajia@redhat.com] > Sent: Tuesday, June 12, 2012 11:38 AM > To: Pankaj Rawat > Cc: libvir-list(a)redhat.com > Subject: Re: [libvirt] Error while installing a guest > > Hi Pankaj, > Could you attach your virt-install.log as an attachment? > it locals in ~/.virtinst/virt-install.log. > > Or Is it okay if you also upgrade your python-virtinst? > > Thanks, > Alex > > > ----- Original Message ----- > From: "Pankaj Rawat" <pankaj.rawat(a)nechclst.in> > To: libvir-list(a)redhat.com > Sent: Tuesday, June 12, 2012 1:56:05 PM > Subject: [libvirt] Error while installing a guest > > > > > > Hi all , > > I have SL6.2 x86_64 Installed on my system > > I updated libvirt version from 0.9.4 to 0.9.11, I had removed previous > libvirt via yum > > I done this by compiling the source. > > > > I started libvirt daemon created by compiling source : > > # ./root/libvirt_0.9.11/build/daomen/libvirtd > > > > Now I tried to create a guest:- > > [root@localhost libvirt-0.9.11]# /usr/sbin/virt-install --accelerate > --hvm --connect qemu:///system --name g3 --vcpu=1 --ram 1024 > --os-type=linux --os-variant=rhel6 --network bridge:br0 --disk > /var/lib/libvirt/images/g2 > --disk=/opt/SL-62-x86_64-2012-02-06-Install-DVD.iso,device=cdrom,perms=ro > --location=/mnt/ --nographics --serial pty > --extra-args=console=ttyS0,115200n8 --keymap=en --force > > > > The command line above normally works fine (I have created many vm by > using same above command) > > > > But here Following error comes > > Starting install... > Retrieving file .treeinfo... | 768 B 00:00 ... > Retrieving file vmlinuz... | 7.5 MB 00:00 ... > Retrieving file initrd.img... 100% > [=====================================================] 11 MB/s | 29 > MB --:-- ETA > > Retrieving file initrd.img... | 59 MB 00:09 ... > ERROR internal error Process exited while reading console log output: > Domain installation does not appear to have been successful. > If it was, you can restart your domain by running: > virsh --connect qemu:///system start g3 > otherwise, please restart your installation. > > at libvirtd console following output comes: > 2012-06-12 13:58:55.239+0000: 17800: error : > qemuProcessReadLogOutput:1298 : internal error Process exited while > reading console log output: > 2012-06-12 14:04:12.120+0000: 17802: warning : qemuDomainObjTaint:1227 > : Domain id=3 name='g3' uuid=fec6cb5a-d4ea-d2c9-505c-611227fb4f4c is > tainted: high-privileges > 2012-06-12 13:58:55.239+0000: 17800: error : > qemuProcessReadLogOutput:1298 : internal error Process exited while > reading console lo > > > > I dont know how to resolve this . > > Regards > > Pankaj Rawat > > DISCLAIMER: > > ----------------------------------------------------------------------------------------------------------------------- > > > The contents of this e-mail and any attachment(s) are confidential and > intended > > for the named recipient(s) only. > > It shall not attach any liability on the originator or NECHCL or its > > affiliates. Any views or opinions presented in > > this email are solely those of the author and may not necessarily > reflect the > > opinions of NECHCL or its affiliates. > > Any form of reproduction, dissemination, copying, disclosure, > modification, > > distribution and / or publication of > > this message without the prior written consent of the author of this > e-mail is > > strictly prohibited. If you have > > received this email in error please delete it and notify the sender > > immediately. . > > ----------------------------------------------------------------------------------------------------------------------- > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list > DISCLAIMER: > > ----------------------------------------------------------------------------------------------------------------------- > > The contents of this e-mail and any attachment(s) are confidential and > intended > > for the named recipient(s) only. > > It shall not attach any liability on the originator or NECHCL or its > > affiliates. Any views or opinions presented in > > this email are solely those of the author and may not necessarily reflect the > > opinions of NECHCL or its affiliates. > > Any form of reproduction, dissemination, copying, disclosure, modification, > > distribution and / or publication of > > this message without the prior written consent of the author of this e-mail is > > strictly prohibited. If you have > > received this email in error please delete it and notify the sender > > immediately. . > > -----------------------------------------------------------------------------------------------------------------------

1 0

[libvirt] [PATCH 0/2] Don't overwrite security labels
by Michal Privoznik 12 Jun '12

12 Jun '12

If we have a running domain A with a PCI/USB device X passthrough, and user wants to start domain B with again device X, we reject start however, call qemuProcessStop to perform rollback. This however does not do any rollback just cleanup therefore rewrite labels on device X leaving domain A in silly situation. Michal Privoznik (2): qemuProcessStop: Switch to flags qemu: Don't overwrite security labels src/qemu/qemu_driver.c | 16 ++++++++-------- src/qemu/qemu_migration.c | 20 +++++++++++++------- src/qemu/qemu_process.c | 28 +++++++++++++++++----------- src/qemu/qemu_process.h | 9 +++++++-- 4 files changed, 45 insertions(+), 28 deletions(-) -- 1.7.8.5

2 5

[libvirt] [PATCH] virsh: let 'connect' without args remember -c option
by Eric Blake 12 Jun '12

12 Jun '12

If a user invokes 'virsh -c $URI', then within that batch shell, they probably want 'connect' to revert to $URI rather than the normal default URI you get for passing in NULL. In particular, I had a setup where qemu:///session was failing, but took 20 seconds to fail; since 'make -C tests check TESTS=virsh-all' exercises the command 'virsh -c test:///default connect' without arguments, it was locking up for 20 seconds trying to connect to qemu, even though the testsuite specifically wants to limit itself to the test:///default URI. * tools/virsh.c (__vshControl): Add member. (main, vshParseArgv): Set it. (vshDeinit): Clean it up. (cmdConnect): Use it to reopen to original connection. --- This doesn't fix the root cause of this problem: https://www.redhat.com/archives/libvir-list/2012-June/msg00237.html but at least it makes my 'make check' runs faster while I still investigate the root problem. tools/virsh.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 0453b95..b28dc49 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -241,6 +241,7 @@ typedef struct __vshCmd { */ typedef struct __vshControl { char *name; /* connection name */ + char *default_name; /* -c or env-var default when name is NULL */ virConnectPtr conn; /* connection to hypervisor (MAY BE NULL) */ vshCmd *cmd; /* the current command */ char *cmdstr; /* string with command */ @@ -856,7 +857,7 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) vshError(ctl, "%s", _("Please specify valid connection URI")); return false; } - ctl->name = vshStrdup(ctl, name); + ctl->name = vshStrdup(ctl, name ? name : ctl->default_name); ctl->useGetInfo = false; ctl->useSnapshotOld = false; @@ -19922,6 +19923,7 @@ vshDeinit(vshControl *ctl) vshReadlineDeinit(ctl); vshCloseLogFile(ctl); VIR_FREE(ctl->name); + VIR_FREE(ctl->default_name); if (ctl->conn) { int ret; if ((ret = virConnectClose(ctl->conn)) != 0) { @@ -20176,7 +20178,8 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) ctl->timing = true; break; case 'c': - ctl->name = vshStrdup(ctl, optarg); + VIR_FREE(ctl->default_name); + ctl->default_name = vshStrdup(ctl, optarg); break; case 'v': if (STRNEQ_NULLABLE(optarg, "long")) { @@ -20211,6 +20214,7 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) exit(EXIT_FAILURE); } } + ctl->name = vshStrdup(ctl, ctl->default_name); if (argc > optind) { /* parse command */ @@ -20268,7 +20272,7 @@ main(int argc, char **argv) progname++; if ((defaultConn = getenv("VIRSH_DEFAULT_CONNECT_URI"))) { - ctl->name = vshStrdup(ctl, defaultConn); + ctl->default_name = vshStrdup(ctl, defaultConn); } if (!vshParseArgv(ctl, argc, argv)) { -- 1.7.10.2

4 7

[libvirt] [PATCH v3 1/2] virsh: add keepalive protocol in virsh
by Guannan Ren 12 Jun '12

12 Jun '12

Bugzilla:https://bugzilla.redhat.com/show_bug.cgi?id=822839 Add two general virsh options to start keepalive messaging in virsh By default, virsh doesn't start keepalive. Under the explicit request of keepalive with the the following options , virsh will try to start keepalive. The virsh will fail if the keepalive request cannot be honored. error: this function is not supported by the connection driver: virConnectSetKeepAlive error: Failed to connect to the hypervisor -i | --keepalive_interval interval time value -n | --keepalive_count number of keepalive message For non-p2p migration, start keepalive for remote driver to determine the status of network connection, aborting migrating job after defined amount of interval time. --- tools/virsh.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++--------- tools/virsh.pod | 13 ++++++ 2 files changed, 105 insertions(+), 18 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 744b629..33aeb6c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -251,6 +251,10 @@ typedef struct __vshControl { bool readonly; /* connect readonly (first time only, not * during explicit connect command) */ + unsigned int keepalive_interval; + /* interval time value */ + unsigned int keepalive_count; + /* keepalive_count value */ char *logfile; /* log file name */ int log_fd; /* log file descriptor */ char *historydir; /* readline history directory name */ @@ -415,13 +419,14 @@ typedef struct __vshCtrlData { vshControl *ctl; const vshCmd *cmd; int writefd; + virConnectPtr dconn; } vshCtrlData; typedef void (*jobWatchTimeoutFunc) (vshControl *ctl, virDomainPtr dom, void *opaque); static bool -vshWatchJob(vshControl *ctl, +vshWatchJob(vshCtrlData *data, virDomainPtr dom, bool verbose, int pipe_fd, @@ -628,6 +633,39 @@ vshSetupSignals(void) { } /* + * vshConnectOpen: + * + * A wrapper for virConnectOpenAuth. + */ +static virConnectPtr +vshConnectOpen(const char *name, + bool readonly, + vshControl *ctl) +{ + virConnectPtr conn; + + if (!ctl) + return NULL; + + conn = virConnectOpenAuth(name, + virConnectAuthPtrDefault, + readonly ? VIR_CONNECT_RO : 0); + if (!conn) + return NULL; + + if (ctl->keepalive_interval > 0 && ctl->keepalive_count > 0) + if (virConnectSetKeepAlive(conn, + ctl->keepalive_interval, + ctl->keepalive_count) < 0) { + virshReportError(ctl); + virConnectClose(conn); + return NULL; + } + + return conn; +} + +/* * vshReconnect: * * Reconnect after a disconnect from libvirtd @@ -643,9 +681,8 @@ vshReconnect(vshControl *ctl) virConnectClose(ctl->conn); } - ctl->conn = virConnectOpenAuth(ctl->name, - virConnectAuthPtrDefault, - ctl->readonly ? VIR_CONNECT_RO : 0); + ctl->conn = vshConnectOpen(ctl->name, ctl->readonly, ctl); + if (!ctl->conn) vshError(ctl, "%s", _("Failed to reconnect to the hypervisor")); else if (connected) @@ -862,8 +899,7 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) ctl->useSnapshotOld = false; ctl->readonly = ro; - ctl->conn = virConnectOpenAuth(ctl->name, virConnectAuthPtrDefault, - ctl->readonly ? VIR_CONNECT_RO : 0); + ctl->conn = vshConnectOpen(ctl->name, ctl->readonly, ctl); if (!ctl->conn) vshError(ctl, "%s", _("Failed to connect to the hypervisor")); @@ -3334,6 +3370,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) data.ctl = ctl; data.cmd = cmd; data.writefd = p[1]; + data.dconn = NULL; if (virThreadCreate(&workerThread, true, @@ -3341,7 +3378,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) &data) < 0) goto cleanup; - ret = vshWatchJob(ctl, dom, verbose, p[0], 0, NULL, NULL, _("Save")); + ret = vshWatchJob(&data, dom, verbose, p[0], 0, NULL, NULL, _("Save")); virThreadJoin(&workerThread); @@ -3608,6 +3645,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) data.ctl = ctl; data.cmd = cmd; data.writefd = p[1]; + data.dconn = NULL; if (virThreadCreate(&workerThread, true, @@ -3615,7 +3653,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) &data) < 0) goto cleanup; - ret = vshWatchJob(ctl, dom, verbose, p[0], 0, + ret = vshWatchJob(&data, dom, verbose, p[0], 0, NULL, NULL, _("Managedsave")); virThreadJoin(&workerThread); @@ -4086,6 +4124,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) data.ctl = ctl; data.cmd = cmd; data.writefd = p[1]; + data.dconn = NULL; if (virThreadCreate(&workerThread, true, @@ -4093,7 +4132,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) &data) < 0) goto cleanup; - ret = vshWatchJob(ctl, dom, verbose, p[0], 0, NULL, NULL, _("Dump")); + ret = vshWatchJob(&data, dom, verbose, p[0], 0, NULL, NULL, _("Dump")); virThreadJoin(&workerThread); @@ -7210,9 +7249,16 @@ doMigrate (void *opaque) virConnectPtr dconn = NULL; virDomainPtr ddom = NULL; - dconn = virConnectOpenAuth (desturi, virConnectAuthPtrDefault, 0); + dconn = vshConnectOpen(desturi, 0, ctl); if (!dconn) goto out; + if (virConnectIsAlive(dconn) <= 0) { + virConnectClose(dconn); + goto out; + } else { + data->dconn = dconn; + } + ddom = virDomainMigrate2(dom, dconn, xml, flags, dname, migrateuri, 0); if (ddom) { virDomainFree(ddom); @@ -7268,7 +7314,7 @@ vshMigrationTimeout(vshControl *ctl, } static bool -vshWatchJob(vshControl *ctl, +vshWatchJob(vshCtrlData *data, virDomainPtr dom, bool verbose, int pipe_fd, @@ -7286,6 +7332,7 @@ vshWatchJob(vshControl *ctl, char retchar; bool functionReturn = false; sigset_t sigmask, oldsigmask; + vshControl *ctl = data->ctl; sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); @@ -7329,6 +7376,13 @@ repoll: goto cleanup; } + if (data->dconn && virConnectIsAlive(data->dconn) <= 0) { + virDomainAbortJob(dom); + vshError(ctl, "%s", + _("Lost connection to destination host")); + goto cleanup; + } + GETTIMEOFDAY(&curr); if (timeout && (((int)(curr.tv_sec - start.tv_sec) * 1000 + (int)(curr.tv_usec - start.tv_usec) / 1000) > @@ -7402,13 +7456,14 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) data.ctl = ctl; data.cmd = cmd; data.writefd = p[1]; + data.dconn = NULL; if (virThreadCreate(&workerThread, true, doMigrate, &data) < 0) goto cleanup; - functionReturn = vshWatchJob(ctl, dom, verbose, p[0], timeout, + functionReturn = vshWatchJob(&data, dom, verbose, p[0], timeout, vshMigrationTimeout, NULL, _("Migration")); virThreadJoin(&workerThread); @@ -19658,9 +19713,7 @@ vshInit(vshControl *ctl) ctl->eventLoopStarted = true; if (ctl->name) { - ctl->conn = virConnectOpenAuth(ctl->name, - virConnectAuthPtrDefault, - ctl->readonly ? VIR_CONNECT_RO : 0); + ctl->conn = vshConnectOpen(ctl->name, ctl->readonly, ctl); /* Connecting to a named connection must succeed, but we delay * connecting to the default connection until we need it @@ -19670,7 +19723,7 @@ vshInit(vshControl *ctl) */ if (!ctl->conn) { virshReportError(ctl); - vshError(ctl, "%s", _("failed to connect to the hypervisor")); + vshError(ctl, "%s", _("Failed to connect to the hypervisor")); return false; } } @@ -20107,7 +20160,10 @@ vshUsage(void) " -v short version\n" " -V long version\n" " --version[=TYPE] version, TYPE is short or long (default short)\n" - " -e | --escape <char> set escape sequence for console\n\n" + " -e | --escape <char> set escape sequence for console\n" + " -i | --keepalive_interval\n" + " interval time value \n" + " -n | --keepalive_count number of keepalive message\n\n" " commands (non interactive mode):\n\n"), progname, progname); for (grp = cmdGroups; grp->name; grp++) { @@ -20284,13 +20340,15 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) {"readonly", no_argument, NULL, 'r'}, {"log", required_argument, NULL, 'l'}, {"escape", required_argument, NULL, 'e'}, + {"keepalive_interval", required_argument, NULL, 'i'}, + {"keepalive_count", required_argument, NULL, 'n'}, {NULL, 0, NULL, 0} }; /* Standard (non-command) options. The leading + ensures that no * argument reordering takes place, so that command options are * not confused with top-level virsh options. */ - while ((arg = getopt_long(argc, argv, "+d:hqtc:vVrl:e:", opt, NULL)) != -1) { + while ((arg = getopt_long(argc, argv, "+d:hqtc:vVrl:e:i:n:", opt, NULL)) != -1) { switch (arg) { case 'd': if (virStrToLong_i(optarg, NULL, 10, &ctl->debug) < 0) { @@ -20339,6 +20397,20 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) exit(EXIT_FAILURE); } break; + case 'i': + if (virStrToLong_ui(optarg, NULL, 10, &ctl->keepalive_interval) < 0) { + vshError(ctl, + "%s", _("option -i takes a non-negative numeric argument")); + exit(EXIT_FAILURE); + } + break; + case 'n': + if (virStrToLong_ui(optarg, NULL, 10, &ctl->keepalive_count) < 0) { + vshError(ctl, + "%s", _("option -n takes a non-negative numeric argument")); + exit(EXIT_FAILURE); + } + break; default: vshError(ctl, _("unsupported option '-%c'. See --help."), arg); exit(EXIT_FAILURE); @@ -20370,6 +20442,8 @@ main(int argc, char **argv) ctl->log_fd = -1; /* Initialize log file descriptor */ ctl->debug = VSH_DEBUG_DEFAULT; ctl->escapeChar = CTRL_CLOSE_BRACKET; + ctl->keepalive_interval = -1; + ctl->keepalive_count = 0; if (!setlocale(LC_ALL, "")) { diff --git a/tools/virsh.pod b/tools/virsh.pod index 6553825..faa97a2 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -98,6 +98,19 @@ Set alternative escape sequence for I<console> command. By default, telnet's B<^]> is used. Allowed characters when using hat notation are: alphabetic character, @, [, ], \, ^, _. +=item B<-i>, B<--keepalive_interval> I<second> + +Use together with I<--keepalive_count> to start keepalive messaging between +libvirt client and server. A keepalive message will be sent to a libvirt server +after I<--keepalive_interval> seconds of inactivity to check if server is still +responding. I<seconds> with 0 value has the same effect as without using this +option. + +=item B<-n>, B<--keepalive_count> I<number> +The maximum number of keepalive messages that are allowed to be sent to libvirt +server without getting any response before the connection is considered broken. +I<number> with 0 value has the same effect as without using this option. + =back =head1 NOTES -- 1.7.7.5

1 1

[libvirt] libvirt modification
by Patrick Raad 12 Jun '12

12 Jun '12

Hello, I am not that expert in development, but I am working on a project for migrating VM between hosts and I need to add a function to libvirt in order to send a certain message. What I am using is KVM-qemu as a hypervisor. When a VM "live" migrates from a host A to a host B, I need that the host B sends a certain message through a socket, once the live migration has been successfully completed and the VM is running on host B. Can you please tell me which file I must modify in order to add my function? What does libvirt uses to notify the destination that the migration is completed. I thought about modifying qemu_migration.c, but it didn't seem to work, so I was thinking about using virsh.c, but this way the destination host won't be notified so I don't think it can work... Any ideas?? Thank you -- Patrick RAAD

2 1

[libvirt] Error while installing a guest
by Pankaj Rawat 12 Jun '12

12 Jun '12

Hi all , I have SL6.2 x86_64 Installed on my system I updated libvirt version from 0.9.4 to 0.9.11, I had removed previous libvirt via yum I done this by compiling the source. I started libvirt daemon created by compiling source : # ./root/libvirt_0.9.11/build/daomen/libvirtd Now I tried to create a guest:- [root@localhost libvirt-0.9.11]# /usr/sbin/virt-install --accelerate --hvm --connect qemu:///system --name g3 --vcpu=1 --ram 1024 --os-type=linux --os-variant=rhel6 --network bridge:br0 --disk /var/lib/libvirt/images/g2 --disk=/opt/SL-62-x86_64-2012-02-06-Install-DVD.iso,device=cdrom,perms=ro --location=/mnt/ --nographics --serial pty --extra-args=console=ttyS0,115200n8 --keymap=en --force The command line above normally works fine (I have created many vm by using same above command) But here Following error comes Starting install... Retrieving file .treeinfo... | 768 B 00:00 ... Retrieving file vmlinuz... | 7.5 MB 00:00 ... Retrieving file initrd.img... 100% [=====================================================] 11 MB/s | 29 MB --:-- ETA Retrieving file initrd.img... | 59 MB 00:09 ... ERROR internal error Process exited while reading console log output: Domain installation does not appear to have been successful. If it was, you can restart your domain by running: virsh --connect qemu:///system start g3 otherwise, please restart your installation. at libvirtd console following output comes: 2012-06-12 13:58:55.239+0000: 17800: error : qemuProcessReadLogOutput:1298 : internal error Process exited while reading console log output: 2012-06-12 14:04:12.120+0000: 17802: warning : qemuDomainObjTaint:1227 : Domain id=3 name='g3' uuid=fec6cb5a-d4ea-d2c9-505c-611227fb4f4c is tainted: high-privileges 2012-06-12 13:58:55.239+0000: 17800: error : qemuProcessReadLogOutput:1298 : internal error Process exited while reading console lo I don't know how to resolve this . Regards Pankaj Rawat DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

2 1

[libvirt] FLOSS Weekly podcast for libvirt is online
by Justin Clift 12 Jun '12

12 Jun '12

Hey all, Eric Blake and Guido Gunther were on the FLOSS Weekly podcast this week, covering libvirt: http://twit.tv/show/floss-weekly/213 (also available in iTunes) Good effort guys. :) + Justin -- Aeolus Community Manager http://www.aeolusproject.org

4 9

[libvirt] [PATCH 0/7] Introduce API for dumping domain IP addresses
by Michal Privoznik 11 Jun '12

11 Jun '12

This feature has been requested for a very long time. However, we had to wait for guest agent to obtain reliable results as user might create totally different structure of interfaces than seen from outside (e.g. bonding, virtual interfaces, etc.). That's the main reason why sniffing for domain traffic can return bogus results. Fortunately, qemu guest agent implement requested part for a while so nothing holds us back anymore. To make matters worse, guest OS can assign whatever name to an interface and changing MAC inside guest isn't propagated to the host which in the end see original one. Therefore, finding correlation between interface within guest and the host side end is left as exercise for mgmt applications. This API is called virDomainInterfacesAddresses (okay, maybe too many plurals) and returns a dynamically allocated array of virDomainInterface struct. The great disadvantage once this gets released, it's written in stone and we cannot change or add an item into it. Therefore we might add a padding into it - something like reserved for future use. On the other hand, everything important is already there - what else we will want to add? :) There are basically two approaches: 1) two APIs: one for list interfaces names, the other for querying addresses on singe interface 2) one API that returns everything I've chosen the latter as it's race free (query for interface that has gone meanwhile). Michal Privoznik (7): Introduce virDomainInterfacesAddresses API virsh: Expose virDomainInterfacesAddresses qemu_agent: Implement 'guest-network-get-interfaces' command handling qemu: Implement virDomainInterfacesAddresses remote: Implement virDomainInterfacesAddresses python: Expose virDomainInterfacesAddresses python: create example for dumping domain IP addresses daemon/remote.c | 122 ++++++++++++++++++++++++++++++ examples/python/Makefile.am | 2 +- examples/python/README | 1 + examples/python/domipaddrs.py | 50 ++++++++++++ include/libvirt/libvirt.h.in | 32 ++++++++ python/generator.py | 1 + python/libvirt-override-api.xml | 6 ++ python/libvirt-override.c | 116 ++++++++++++++++++++++++++++ src/driver.h | 6 ++ src/libvirt.c | 101 +++++++++++++++++++++++++ src/libvirt_public.syms | 5 + src/qemu/qemu_agent.c | 158 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 4 + src/qemu/qemu_driver.c | 76 +++++++++++++++++++ src/remote/remote_driver.c | 95 +++++++++++++++++++++++ src/remote/remote_protocol.x | 25 ++++++- tools/virsh.c | 92 +++++++++++++++++++++++ tools/virsh.pod | 10 +++ 18 files changed, 900 insertions(+), 2 deletions(-) create mode 100644 examples/python/domipaddrs.py -- 1.7.8.5

7 21

[libvirt] [PATCH 0/4] virsh snapshot-info
by Eric Blake 11 Jun '12

11 Jun '12

I'm working on a patch series to allow offline disk snapshots, and in the process, I found that I either don't have enough information ('virsh snapshot-list' is great for a summary, but not for an individual snapshot) or too much ('virsh snapshot-dumpxml' means I have to wade through the XML). This provides an intermediate view, designed for ease of use. Eric Blake (4): snapshot: new query APIs snapshot: add 'virsh snapshot-info' snapshot: RPC for new query APIs snapshot: implement new APIs for qemu, esx, and vbox include/libvirt/libvirt.h.in | 9 +++ src/driver.h | 10 +++ src/esx/esx_driver.c | 71 ++++++++++++++++++++++++ src/libvirt.c | 85 ++++++++++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_driver.c | 83 ++++++++++++++++++++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 23 +++++++- src/remote_protocol-structs | 16 +++++ src/vbox/vbox_tmpl.c | 97 ++++++++++++++++++++++++++++++++ tools/virsh.c | 125 ++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 5 ++ 12 files changed, 531 insertions(+), 1 deletions(-) -- 1.7.7.6

2 15

[libvirt] [PATCH] docs: minor fixes to domain interface documentation
by Laine Stump 11 Jun '12

11 Jun '12

A few examples for <interface> had a type='direct' interface with no sub-elements. This is not allowed - a type='direct' interface must have at least a source element. (Most likely the example was copied from the type='user' or type='ethernet' examples - they *do* allow an instance with no sub-elements). There was also one place that mistakenly used %lt; ... %gt; instead of < ... > (for some reason, I make that typo all the time). --- Pushed under the trivial rule. docs/formatdomain.html.in | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 95c3edc..b2e5db9 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2364,7 +2364,6 @@ <pre> ... <devices> - <interface type='direct'/> ... <interface type='direct'> <source dev='eth0' mode='vepa'/> @@ -2413,7 +2412,6 @@ <pre> ... <devices> - <interface type='direct'/> ... <interface type='direct'> <source dev='eth0.2' mode='vepa'/> @@ -2441,7 +2439,6 @@ <pre> ... <devices> - <interface type='direct'/> ... <interface type='direct'> <source dev='eth0' mode='private'/> @@ -2462,7 +2459,7 @@ passthrough, after first optionally setting the device's MAC address to the configured value, and associating the device with an 802.1Qgh capable switch using an optionally specified - %lt;virtualport%gt; element (see the examples of virtualport + <virtualport> element (see the examples of virtualport given above for type='direct' network devices). Note that - due to limitations in standard single-port PCI ethernet card driver design - only SR-IOV (Single Root I/O Virtualization) virtual -- 1.7.10.2

1 0

[libvirt] [PATCH] Two RPM conditional fixes for RHEL-7
by Daniel P. Berrange 11 Jun '12

11 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Ensure systemd is used in RHEL-7 and cgconfig is not used in RHEL-7 --- libvirt.spec.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index a78b117..f8e3b05 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -133,8 +133,9 @@ %define with_hyperv 0 %endif -# Although earlier Fedora has systemd, libvirt still used sysvinit -%if 0%{?fedora} >= 17 +# Fedora 17 / RHEL-7 are first where we use systemd. Although earlier +# Fedora has systemd, libvirt still used sysvinit there. +%if 0%{?fedora} >= 17 || 0{?rhel} >= 7 %define with_systemd 1 %endif @@ -1348,9 +1349,9 @@ if [ $1 -eq 1 ] ; then fi %else %if %{with_cgconfig} -# Starting with Fedora 16, systemd automounts all cgroups, and cgconfig is -# no longer a necessary service. -%if 0%{?rhel} || (0%{?fedora} && 0%{?fedora} < 16) +# Starting with Fedora 16/RHEL-7, systemd automounts all cgroups, +# and cgconfig is no longer a necessary service. +%if (0%{?rhel} && 0%{?rhel} < 7) || (0%{?fedora} && 0%{?fedora} < 16) if [ "$1" -eq "1" ]; then /sbin/chkconfig cgconfig on fi -- 1.7.10.2

2 1

[libvirt] [PATCH] nwfilter: Display detected IP address in domain XML
by Stefan Berger 11 Jun '12

11 Jun '12

Display detected IP addresses in the domain XML using the IP_LEASE variable name. This variable name now becomes a reserved variable name that can be read only but not set by the user. The format of the value is: <ip address>,<lease timeout in seconds> An example of a displayed XML may then be: <interface type='bridge'> <mac address='52:54:00:68:e3:90'/> <source bridge='virbr0'/> <target dev='vnet1'/> <model type='virtio'/> <filterref filter='clean-traffic'> <parameter name='CTRL_IP_LEARNING' value='dhcp'/> <parameter name='IP_LEASE' value='192.168.122.210,100'/> </filterref> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </interface> This patch now also offers a better (libvirt-internal) API for accessing the detected IP addresses. The function virDomainConfNWFilterGetLeases can be used to retrieve a list of IP leases associated with a given interface. This function will then either retrieve the data from the DHCP snooping or IP learning subsystems, depending on which detection algorithm has been activated. If none is active, a NULL pointer for the array of leases will be returned. --- PS: This is the last remaining patch of the DHCP snooping series. I am submitting it now as a stand-alone patch restarting the version counting. --- docs/formatnwfilter.html.in | 27 +++++++++++ src/conf/domain_conf.c | 16 +++++-- src/conf/domain_nwfilter.c | 13 +++++ src/conf/domain_nwfilter.h | 15 ++++++ src/conf/nwfilter_conf.c | 3 - src/conf/nwfilter_ipaddrmap.c | 51 ++++++++++++++++++++++ src/conf/nwfilter_ipaddrmap.h | 5 ++ src/conf/nwfilter_params.c | 75 ++++++++++++++++++++++++++++++++- src/conf/nwfilter_params.h | 9 +++ src/libvirt_private.syms | 5 +- src/nwfilter/nwfilter_dhcpsnoop.c | 59 +++++++++++++++++++++++++ src/nwfilter/nwfilter_dhcpsnoop.h | 4 + src/nwfilter/nwfilter_driver.c | 10 ++++ src/nwfilter/nwfilter_gentech_driver.c | 26 +++++++++++ src/nwfilter/nwfilter_gentech_driver.h | 8 +++ src/nwfilter/nwfilter_learnipaddr.c | 9 +++ src/nwfilter/nwfilter_learnipaddr.h | 2 src/util/viriplease.h | 18 +++++++ 18 files changed, 345 insertions(+), 10 deletions(-) Index: libvirt-acl/src/conf/nwfilter_params.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_params.h +++ libvirt-acl/src/conf/nwfilter_params.h @@ -72,7 +72,10 @@ struct _virNWFilterHashTable { virNWFilterHashTablePtr virNWFilterParseParamAttributes(xmlNodePtr cur); int virNWFilterFormatParamAttributes(virBufferPtr buf, virNWFilterHashTablePtr table, - const char *filterref); + const char *filterref, + const unsigned char *vmuuid, + const unsigned char *mac, + const char *ifname); virNWFilterHashTablePtr virNWFilterHashTableCreate(int n); void virNWFilterHashTableFree(virNWFilterHashTablePtr table); @@ -89,12 +92,14 @@ int virNWFilterHashTablePutAll(virNWFilt "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_" # define VALID_VARVALUE \ - "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.:" + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.:," # define NWFILTER_VARNAME_IP "IP" # define NWFILTER_VARNAME_MAC "MAC" # define NWFILTER_VARNAME_CTRL_IP_LEARNING "CTRL_IP_LEARNING" # define NWFILTER_VARNAME_DHCPSERVER "DHCPSERVER" +# define NWFILTER_VARNAME_IP_LEASE "IP_LEASE" +# define NWFILTER_VARNAME_IPV6_LEASE "IPV6_LEASE" /* future */ enum virNWFilterVarAccessType { VIR_NWFILTER_VAR_ACCESS_ELEMENT = 0, Index: libvirt-acl/src/conf/domain_conf.c =================================================================== --- libvirt-acl.orig/src/conf/domain_conf.c +++ libvirt-acl/src/conf/domain_conf.c @@ -43,6 +43,7 @@ #include "buf.h" #include "c-ctype.h" #include "logging.h" +#include "nwfilter_params.h" #include "nwfilter_conf.h" #include "ignore-value.h" #include "storage_file.h" @@ -11500,7 +11501,8 @@ error: static int virDomainNetDefFormat(virBufferPtr buf, virDomainNetDefPtr def, - unsigned int flags) + unsigned int flags, + const unsigned char *vmuuid) { const char *type = virDomainNetTypeToString(def->type); @@ -11641,9 +11643,15 @@ virDomainNetDefFormat(virBufferPtr buf, } } if (def->filter) { + const char *ifname = NULL; + + if (!(flags & VIR_DOMAIN_XML_INACTIVE)) + ifname = def->ifname; + virBufferAdjustIndent(buf, 6); if (virNWFilterFormatParamAttributes(buf, def->filterparams, - def->filter) < 0) + def->filter, vmuuid, def->mac, + ifname) < 0) return -1; virBufferAdjustIndent(buf, -6); } @@ -12969,7 +12977,7 @@ virDomainDefFormatInternal(virDomainDefP for (n = 0 ; n < def->nnets ; n++) - if (virDomainNetDefFormat(buf, def->nets[n], flags) < 0) + if (virDomainNetDefFormat(buf, def->nets[n], flags, def->uuid) < 0) goto cleanup; for (n = 0 ; n < def->nsmartcards ; n++) @@ -15222,7 +15230,7 @@ virDomainDeviceDefCopy(virCapsPtr caps, rc = virDomainFSDefFormat(&buf, src->data.fs, flags); break; case VIR_DOMAIN_DEVICE_NET: - rc = virDomainNetDefFormat(&buf, src->data.net, flags); + rc = virDomainNetDefFormat(&buf, src->data.net, flags, def->uuid); break; case VIR_DOMAIN_DEVICE_INPUT: rc = virDomainInputDefFormat(&buf, src->data.input, flags); Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -3406,7 +3406,8 @@ virNWFilterIncludeDefFormat(virNWFilterI virBufferAdjustIndent(&buf, 2); if (virNWFilterFormatParamAttributes(&buf, inc->params, - inc->filterref) < 0) { + inc->filterref, + NULL, NULL, NULL) < 0) { virBufferFreeAndReset(&buf); return NULL; } Index: libvirt-acl/src/libvirt_private.syms =================================================================== --- libvirt-acl.orig/src/libvirt_private.syms +++ libvirt-acl/src/libvirt_private.syms @@ -552,6 +552,7 @@ virDomainLockLeaseDetach; # domain_nwfilter.h +virDomainConfNWFiltetGetLeases; virDomainConfNWFilterInstantiate; virDomainConfNWFilterRegister; virDomainConfNWFilterTeardown; @@ -873,15 +874,17 @@ virNWFilterTestUnassignDef; virNWFilterUnlockFilterUpdates; -# nwfilter_ipaddrmap +# nwfilter_ipaddrmap.h virNWFilterIPAddrMapAddIPAddr; virNWFilterIPAddrMapDelIPAddr; virNWFilterIPAddrMapGetIPAddr; +virNWFilterIPAddrMapGetIPLeases; virNWFilterIPAddrMapInit; virNWFilterIPAddrMapShutdown; # nwfilter_params.h +virNWFilterFormatParamAttributes; virNWFilterHashTableCreate; virNWFilterHashTableFree; virNWFilterHashTablePut; Index: libvirt-acl/src/conf/nwfilter_params.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_params.c +++ libvirt-acl/src/conf/nwfilter_params.c @@ -31,9 +31,16 @@ #include "nwfilter_params.h" #include "domain_conf.h" #include "logging.h" +#include "domain_nwfilter.h" +#include "nwfilter_ipaddrmap.h" #define VIR_FROM_THIS VIR_FROM_NWFILTER +static const char *virNWFilterReservedVarnames[] = { + NWFILTER_VARNAME_IP_LEASE, + NWFILTER_VARNAME_IPV6_LEASE, +}; + static bool isValidVarValue(const char *value); static void virNWFilterVarAccessSetIntIterId(virNWFilterVarAccessPtr, unsigned int); @@ -784,6 +791,19 @@ virNWFilterParseVarValue(const char *val return virNWFilterVarValueCreateSimpleCopyValue(val); } +static void +virNWFilterDelReservedVarnames(virNWFilterHashTablePtr ht) +{ + unsigned int i; + virNWFilterVarValuePtr val; + + for (i = 0; i < ARRAY_CARDINALITY(virNWFilterReservedVarnames); i++) { + val = virNWFilterHashTableRemoveEntry(ht, + virNWFilterReservedVarnames[i]); + virNWFilterVarValueFree(val); + } +} + virNWFilterHashTablePtr virNWFilterParseParamAttributes(xmlNodePtr cur) { @@ -834,6 +854,15 @@ skip_entry: } cur = cur->next; } + + /* + * read-only variables that may be usable in an incoming + * migration could be wired up here. + */ + + /* remove all reserved varnames from the table */ + virNWFilterDelReservedVarnames(table); + return table; err_exit: @@ -855,10 +884,16 @@ virNWFilterFormatParameterNameSorter(con int virNWFilterFormatParamAttributes(virBufferPtr buf, virNWFilterHashTablePtr table, - const char *filterref) + const char *filterref, + const unsigned char *vmuuid, + const unsigned char *mac, + const char *ifname) { virHashKeyValuePairPtr items; + virIPLeasePtr leases = NULL; + size_t nLeases = 0; int i, j, card, numKeys; + int ret = 0; numKeys = virHashSize(table->hashTable); @@ -889,14 +924,50 @@ virNWFilterFormatParamAttributes(virBuff virNWFilterVarValueGetNthValue(value, j)); } + if (ifname) { + time_t now = time(0); + /* also display the IP addresses being used */ + if (virDomainConfNWFilterGetLeases(&leases, &nLeases, + table, + ifname, + vmuuid, + mac) < 0) { + ret = -1; + goto cleanup; + } + + for (i = 0; i < nLeases; i++) { + int64_t to; + char *ipbuf = virSocketAddrFormat(&leases[i].addr); + + if (!ipbuf) { + virReportOOMError(); + ret = -1; + goto cleanup; + } + + to = (leases[i].timeout != VIR_IPLEASE_TIMEOUT_NONE) + ? (int64_t)(leases[i].timeout - now) + : -1; + + virBufferAsprintf(buf, + " <parameter name='" + NWFILTER_VARNAME_IP_LEASE + "' value='%s,%ld'/>\n", + ipbuf, to); + VIR_FREE(ipbuf); + } + } virBufferAddLit(buf, "</filterref>\n"); } else { virBufferAddLit(buf, "/>\n"); } +cleanup: VIR_FREE(items); + VIR_FREE(leases); - return 0; + return ret; } void Index: libvirt-acl/src/nwfilter/nwfilter_dhcpsnoop.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_dhcpsnoop.c +++ libvirt-acl/src/nwfilter/nwfilter_dhcpsnoop.c @@ -1987,6 +1987,57 @@ virNWFilterSnoopLeaseFileLoad(void) } /* + * Get the detected IP addresses along with their absolute lease timeout. + */ +int +virNWFilterSnoopGetLeases(virIPLeasePtr *leases, size_t *nLeases, + const unsigned char *vmuuid, + const unsigned char *macaddr) +{ + int ret = 0; + char ifkey[VIR_IFKEY_LEN]; + virNWFilterSnoopReqPtr req; + virNWFilterSnoopIPLeasePtr ipl; + size_t ctr = 0; + virIPLeasePtr myleases = NULL; + + *leases = NULL; + + virNWFilterSnoopIFKeyFMT(ifkey, vmuuid, macaddr); + + req = virNWFilterSnoopReqGetByIFKey(ifkey); + if (req) { + time_t now = time(0); + + /* protect req->start */ + virNWFilterSnoopReqLock(req); + + for (ipl = req->start; ipl; ipl = ipl->next) { + if (ipl->timeout <= now) + continue; + + if (VIR_EXPAND_N(myleases, ctr, 1) < 0) { + VIR_FREE(myleases); + ret = -1; + goto cleanup; + } + + myleases[ctr-1].addr = ipl->ipAddress; + myleases[ctr-1].timeout = ipl->timeout; + } + + *leases = myleases; + *nLeases = ctr; + +cleanup: + virNWFilterSnoopReqUnlock(req); + + virNWFilterSnoopReqPut(req); + } + return ret; +} + +/* * Wait until all threads have ended. */ static void @@ -2174,6 +2225,14 @@ virNWFilterDHCPSnoopShutdown(void) #else /* HAVE_LIBPCAP */ int +virNWFilterSnoopGetLeases(virIPLeasePtr *leases ATTRIBUTE_UNUSED, + size_t *nLeases ATTRIBUTE_UNUSED, + const unsigned char *vmuuid ATTRIBUTE_UNUSED, + const unsigned char *macaddr ATTRIBUTE_UNUSED) +{ +} + +int virNWFilterDHCPSnoopInit(void) { return -1; Index: libvirt-acl/src/nwfilter/nwfilter_dhcpsnoop.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_dhcpsnoop.h +++ libvirt-acl/src/nwfilter/nwfilter_dhcpsnoop.h @@ -36,4 +36,8 @@ int virNWFilterDHCPSnoopReq(virNWFilterT virNWFilterHashTablePtr filterparams, virNWFilterDriverStatePtr driver); void virNWFilterDHCPSnoopEnd(const char *ifname); +int virNWFilterSnoopGetLeases(virIPLeasePtr *leases, size_t *nLeases, + const unsigned char *vmuuid, + const unsigned char *macaddr); + #endif /* __NWFILTER_DHCPSNOOP_H */ Index: libvirt-acl/src/conf/domain_nwfilter.c =================================================================== --- libvirt-acl.orig/src/conf/domain_nwfilter.c +++ libvirt-acl/src/conf/domain_nwfilter.c @@ -60,3 +60,16 @@ virDomainConfVMNWFilterTeardown(virDomai virDomainConfNWFilterTeardown(vm->def->nets[i]); } } + +int +virDomainConfNWFilterGetLeases(virIPLeasePtr *leases, size_t *nLeases, + virNWFilterHashTablePtr table, + const char *ifname, + const unsigned char *vmuuid, + const unsigned char *mac) +{ + if (nwfilterDriver != NULL) + return nwfilterDriver->getLeases(leases, nLeases, table, ifname, + vmuuid, mac); + return 0; +} Index: libvirt-acl/src/conf/domain_nwfilter.h =================================================================== --- libvirt-acl.orig/src/conf/domain_nwfilter.h +++ libvirt-acl/src/conf/domain_nwfilter.h @@ -23,14 +23,24 @@ #ifndef DOMAIN_NWFILTER_H # define DOMAIN_NWFILTER_H +# include "viriplease.h" + typedef int (*virDomainConfInstantiateNWFilter)(virConnectPtr conn, const unsigned char *vmuuid, virDomainNetDefPtr net); typedef void (*virDomainConfTeardownNWFilter)(virDomainNetDefPtr net); +typedef int (*virDomainConfGetLeases)(virIPLeasePtr *leases, + size_t *nLeases, + virNWFilterHashTablePtr table, + const char *ifname, + const unsigned char *vmuuid, + const unsigned char *mac); + typedef struct { virDomainConfInstantiateNWFilter instantiateFilter; virDomainConfTeardownNWFilter teardownFilter; + virDomainConfGetLeases getLeases; } virDomainConfNWFilterDriver; typedef virDomainConfNWFilterDriver *virDomainConfNWFilterDriverPtr; @@ -41,5 +51,10 @@ int virDomainConfNWFilterInstantiate(vir virDomainNetDefPtr net); void virDomainConfNWFilterTeardown(virDomainNetDefPtr net); void virDomainConfVMNWFilterTeardown(virDomainObjPtr vm); +int virDomainConfNWFilterGetLeases(virIPLeasePtr *leases, size_t *nLeases, + virNWFilterHashTablePtr table, + const char *ifname, + const unsigned char *vmuuid, + const unsigned char *mac); #endif /* DOMAIN_NWFILTER_H */ Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -1209,3 +1209,29 @@ virNWFilterDomainFWUpdateCB(void *payloa virDomainObjUnlock(obj); } + +int +virNWFilterGetLeases(virIPLeasePtr *leases, size_t *nLeases, + virNWFilterHashTablePtr vars, + const char *ifname, + const unsigned char *vmuuid, + const unsigned char *mac) +{ + virNWFilterVarValuePtr lv; + const char *learning = NULL; + int ret = 0; + + if (!vars) + return 0; + + lv = virHashLookup(vars->hashTable, NWFILTER_VARNAME_CTRL_IP_LEARNING); + if (lv) + learning = virNWFilterVarValueGetNthValue(lv, 0); + + if (!learning || STRCASEEQ(learning, "any")) { + ret = virNWFilterLearnGetLeases(leases, nLeases, ifname); + } else if (STRCASEEQ(learning, "dhcp")) { + ret = virNWFilterSnoopGetLeases(leases, nLeases, vmuuid, mac); + } + return ret; +} Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.h +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h @@ -23,6 +23,8 @@ #ifndef __NWFILTER_GENTECH_DRIVER_H # define __NWFILTER_GENTECH_DRIVER_H +# include "viriplease.h" + virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name); int virNWFilterRuleInstAddData(virNWFilterRuleInstPtr res, @@ -64,4 +66,10 @@ void virNWFilterDomainFWUpdateCB(void *p const void *name, void *data); +int virNWFilterGetLeases(virIPLeasePtr *leases, size_t *nLeases, + virNWFilterHashTablePtr vars, + const char *ifname, + const unsigned char *vmmuid, + const unsigned char *mac); + #endif Index: libvirt-acl/src/nwfilter/nwfilter_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_driver.c @@ -463,6 +463,15 @@ nwfilterTeardownFilter(virDomainNetDefPt virNWFilterTeardownFilter(net); } +static int +nwfilterGetLeases(virIPLeasePtr *leases, size_t *nLeases, + virNWFilterHashTablePtr vars, + const char *ifname, + const unsigned char *vmuuid, + const unsigned char *mac) +{ + return virNWFilterGetLeases(leases, nLeases, vars, ifname, vmuuid, mac); +} static virNWFilterDriver nwfilterDriver = { .name = "nwfilter", @@ -490,6 +499,7 @@ static virStateDriver stateDriver = { static virDomainConfNWFilterDriver domainNWFilterDriver = { .instantiateFilter = nwfilterInstantiateFilter, .teardownFilter = nwfilterTeardownFilter, + .getLeases = nwfilterGetLeases, }; Index: libvirt-acl/src/conf/nwfilter_ipaddrmap.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_ipaddrmap.h +++ libvirt-acl/src/conf/nwfilter_ipaddrmap.h @@ -26,6 +26,9 @@ #ifndef __VIR_NWFILTER_IPADDRMAP_H # define __VIR_NWFILTER_IPADDRMAP_H +# include "buf.h" +# include "viriplease.h" + int virNWFilterIPAddrMapInit(void); void virNWFilterIPAddrMapShutdown(void); @@ -33,5 +36,7 @@ int virNWFilterIPAddrMapAddIPAddr(const int virNWFilterIPAddrMapDelIPAddr(const char *ifname, const char *ipaddr); virNWFilterVarValuePtr virNWFilterIPAddrMapGetIPAddr(const char *ifname); +int virNWFilterIPAddrMapGetIPLeases(const char *ifname, + virIPLeasePtr *leases, size_t *nLeases); #endif /* __VIR_NWFILTER_IPADDRMAP_H */ Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.c +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c @@ -771,6 +771,15 @@ virNWFilterLearnIPAddress(virNWFilterTec } #endif /* HAVE_LIBPCAP */ +/* + * Get the detected IP addresses along with their absolute lease timeout + */ +int +virNWFilterLearnGetLeases(virIPLeasePtr *leases, size_t *nLeases, + const char *ifname) +{ + return virNWFilterIPAddrMapGetIPLeases(ifname, leases, nLeases); +} /** * virNWFilterLearnInit Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.h +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.h @@ -71,5 +71,7 @@ void virNWFilterUnlockIface(const char * int virNWFilterLearnInit(void); void virNWFilterLearnShutdown(void); void virNWFilterLearnThreadsTerminate(bool allowNewThreads); +int virNWFilterLearnGetLeases(virIPLeasePtr *leases, size_t *nLeases, + const char *ifname); #endif /* __NWFILTER_LEARNIPADDR_H */ Index: libvirt-acl/docs/formatnwfilter.html.in =================================================================== --- libvirt-acl.orig/docs/formatnwfilter.html.in +++ libvirt-acl/docs/formatnwfilter.html.in @@ -446,6 +446,22 @@ </interface> </pre> + + Once an IP address has been detected, the domain's interface XML + will display the detected IP address and its lease expiration time + in seconds. Note that the <code>IP_LEASE</code> variable is read-only + and cannot be set by the user. + +<pre> + <interface type='bridge'> + <source bridge='virbr0'/> + <filterref filter='clean-traffic'> + <parameter name='CTRL_IP_LEARNING' value='dhcp'/> + <parameter name='IP_LEASE' value='192.168.122.100,200'/> + </filterref> + </interface> +</pre> + <h3><a name="nwfelemsReservedVars">Reserved Variables</a></h3> The following table lists reserved variables in use by libvirt. @@ -481,6 +497,17 @@ <td> CTRL_IP_LEARNING </td> <td> The choice of the IP address detection mode </td> </tr> + <tr> + <td> IP_LEASE (Since 0.9.13)</td> + <td> Read-only variable displaying the detected IP lease in the + format IP address,lease expiration time in seconds </td> + </tr> + <tr> + <td> IPV6_LEASE </td> + <td> Not currently implemented: + Read-only variable displaying the detected IPV6 lease in the + format IPV6 address,lease expiration time in seconds </td> + </tr> </table> <h2><a name="nwfelems">Element and attribute overview</a></h2> Index: libvirt-acl/src/util/viriplease.h =================================================================== --- /dev/null +++ libvirt-acl/src/util/viriplease.h @@ -0,0 +1,18 @@ +#ifndef __VIR_IPLEASE_H__ +# define __VIR_IPLEASE_H__ + +# include <time.h> + +# include "virsocketaddr.h" + +typedef struct _virIPLease virIPLease; +typedef virIPLease *virIPLeasePtr; + +struct _virIPLease { + virSocketAddr addr; + time_t timeout; +}; + +#define VIR_IPLEASE_TIMEOUT_NONE (-1) + +#endif /* __VIR_IP_LEASE_H__ */ Index: libvirt-acl/src/conf/nwfilter_ipaddrmap.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_ipaddrmap.c +++ libvirt-acl/src/conf/nwfilter_ipaddrmap.c @@ -28,6 +28,7 @@ #include "virterror_internal.h" #include "datatypes.h" +#include "memory.h" #include "nwfilter_params.h" #include "nwfilter_ipaddrmap.h" @@ -142,6 +143,56 @@ virNWFilterIPAddrMapGetIPAddr(const char return res; } +/* + * Get the IP addresses associated with the interface as an array + * of virIPLease. Since we don't know about lease timeouts here, we + * set the lease timeout to VIR_IPLEASE_TIMEOUT_NONE. + */ +int +virNWFilterIPAddrMapGetIPLeases(const char *ifname, + virIPLeasePtr *leases, size_t *nLeases) +{ + int ret = 0; + virNWFilterVarValuePtr val; + virIPLeasePtr myleases = NULL; + + *leases = NULL; + + virMutexLock(&ipAddressMapLock); + + val = virHashLookup(ipAddressMap->hashTable, ifname); + + if (val) { + size_t card = virNWFilterVarValueGetCardinality(val); + unsigned int i; + + if (VIR_ALLOC_N(myleases, card) < 0) { + virReportOOMError(); + ret = -1; + goto cleanup; + } + + for (i = 0; i < card; i++) { + const char *value = virNWFilterVarValueGetNthValue(val, i); + + if (virSocketAddrParse(&myleases[i].addr, value, AF_UNSPEC) < 0) { + VIR_FREE(myleases); + ret = -1; + goto cleanup; + } + myleases[i].timeout = VIR_IPLEASE_TIMEOUT_NONE; + } + + *leases = myleases; + *nLeases = card; + } + +cleanup: + virMutexUnlock(&ipAddressMapLock); + + return ret; +} + int virNWFilterIPAddrMapInit(void) {

3 3

[libvirt] Per-guest configurable user/group for QEMU processes
by Marcelo Cerri 11 Jun '12

11 Jun '12

Hi, This set of patches updates the libvirt's security driver mechanism to support per-guest configurable user and group for QEMU processes running together with other security drivers, such as SELinux and AppArmor. This patches implement the changes discussed in the following thread: https://www.redhat.com/archives/libvir-list/2012-February/msg00990.html Regards, Marcelo Cerri

3 22

[libvirt] [PATCH] rpc: Fix memleak in virNetMessageEncodeHeader
by Michal Privoznik 11 Jun '12

11 Jun '12

My latest patch for RPC rework (a2c304f6872) introduced a memory leak. virNetMessageEncodeHeader() is calling VIR_ALLOC_N(msg->buffer, ...) despite fact, that msg->buffer isn't VIR_FREE()'d on all paths calling the function. Therefore, rather than injecting free statement switch to VIR_REALLOC_N(). --- src/rpc/virnetmessage.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index dc4c212..82d5f8d 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -219,7 +219,7 @@ int virNetMessageEncodeHeader(virNetMessagePtr msg) unsigned int len = 0; msg->bufferLength = VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX; - if (VIR_ALLOC_N(msg->buffer, msg->bufferLength) < 0) { + if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) { virReportOOMError(); goto cleanup; } -- 1.7.8.5

2 2

[libvirt] [PATCH] snapshot: avoid virsh crash with older servers
by Eric Blake 11 Jun '12

11 Jun '12

Commits 51082301, 16d7b39, and 521cc447 introduced support for 'virsh snapshot-list --from' when talking to a server older than 0.9.5, but broke support for plain 'virsh snapshot-list' for the same old server in the process. Because the code is not properly gated, we end up with a SIGSEGV during a strcmp with a NULL argument. * tools/virsh.c (cmdSnapshotList): Don't waste time on fallbacks when --from is not present. --- Caveat: I tested by manually setting ctl->useSnapshotOld=true in virsh.c, rather than actually loading an older libvirtd, but I'm confident that the results would be the same. tools/virsh.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index abcfbff..0453b95 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -16740,10 +16740,10 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) qsort(&names[0], actual, sizeof(char*), namesorter); - if (tree || ctl->useSnapshotOld) { + if (tree || (from && ctl->useSnapshotOld)) { parents = vshCalloc(ctl, sizeof(char *), actual); for (i = (from && !ctl->useSnapshotOld); i < actual; i++) { - if (ctl->useSnapshotOld && STREQ(names[i], from)) { + if (from && ctl->useSnapshotOld && STREQ(names[i], from)) { start_index = i; continue; } @@ -16765,7 +16765,8 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) char indentBuf[INDENT_BUFLEN]; for (i = 0 ; i < actual ; i++) { memset(indentBuf, '\0', sizeof(indentBuf)); - if (ctl->useSnapshotOld ? STREQ(names[i], from) : !parents[i]) + if ((from && ctl->useSnapshotOld) ? STREQ(names[i], from) : + !parents[i]) cmdNodeListDevicesPrint(ctl, names, parents, @@ -16834,7 +16835,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) } for (i = 0; i < actual; i++) { - if (ctl->useSnapshotOld && + if (from && ctl->useSnapshotOld && (descendants ? !names[i] : STRNEQ_NULLABLE(parents[i], from))) continue; -- 1.7.10.2

2 2

[libvirt] [PATCH] Only migrate profile in non-privileged libvirtd instance
by Daniel P. Berrange 11 Jun '12

11 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Only the non-privileged libvirtd instance uses $HOME. So avoid running the code for migrating to XDG directories unless using a non-privileged libvirtd --- daemon/libvirtd.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index d5ad05e..de6c96e 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -783,6 +783,8 @@ static int migrateProfile(void) int ret = -1; mode_t old_umask; + VIR_DEBUG("Checking if user profile needs migrating"); + if (!(home = virGetUserDirectory())) goto cleanup; @@ -795,6 +797,9 @@ static int migrateProfile(void) goto cleanup; if (!virFileIsDir(old_base) || virFileExists(config_dir)) { + VIR_DEBUG("No old profile in '%s' / " + "new profile directory already present '%s'", + old_base, config_dir); ret = 0; goto cleanup; } @@ -830,6 +835,7 @@ static int migrateProfile(void) goto cleanup; } + VIR_DEBUG("Profile migrated from %s to %s", old_base, config_dir); ret = 0; cleanup: @@ -1063,7 +1069,8 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } - if (migrateProfile() < 0) + if (!privileged && + migrateProfile() < 0) exit(EXIT_FAILURE); if (config->host_uuid && -- 1.7.10.2

2 1

[libvirt] [PATCH] Fix privileges on /var/run/libvirt directory
by Daniel P. Berrange 11 Jun '12

11 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Previous commit commit 32a9aac2e04c991340b66c855a1095e4e6445e54 Author: William Jon McCann <william.jon.mccann(a)gmail.com> Date: Thu May 3 12:36:27 2012 -0400 Use XDG Base Directories instead of storing in home directory Accidentally changed the umask when creating /var/run/libvirt to 077. This prevents /var/run/libvirt being readable by non-root, which is required for non-root to connect to libvirtd. Fix the code so that umask 077 is only used for the non-privileged libvirtd instance. --- daemon/libvirtd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index de6c96e..c1ee3f4 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1131,7 +1131,10 @@ int main(int argc, char **argv) { goto cleanup; } - old_umask = umask(077); + if (privileged) + old_umask = umask(022); + else + old_umask = umask(077); if (virFileMakePath(run_dir) < 0) { char ebuf[1024]; VIR_ERROR(_("unable to create rundir %s: %s"), run_dir, -- 1.7.10.2

2 1

[libvirt] [patch]make rundir permission equals to socket permission to support unprivileged access
by Royce Lv 11 Jun '12

11 Jun '12

Libvirt-socket-rw and libvirt-socket-ro are not used only for libvirt or root user, but also for unprivileged application such as vdsm, Restrain the rundir only read/search for libvirt prevent comunication with unprivileged client,change rundir the permission equals to the sockets permission. See bug: https://bugzilla.redhat.com/show_bug.cgi?id=828073 Signed-off-by: lvroyce <lvroyce(a)linux.vnet.ibm.com> --- daemon/libvirtd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index c74cd43..6095072 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -293,7 +293,7 @@ daemonUnixSocketPaths(struct daemonConfig *config, if (!(rundir = virGetUserRuntimeDirectory())) goto error; - old_umask = umask(077); + old_umask = umask(022); if (virFileMakePath(rundir) < 0) { umask(old_umask); goto error;

3 4

[libvirt] Multiple KVM virtio console is not working.
by Pankaj Rawat 11 Jun '12

11 Jun '12

Let me explain our scenario: We need to provide multiple console options so that from Host, user can login into the KVM guest using different console. Environment - Fedora 17 (Host), Fedora 17 (Guest) Libvirt version installed - 0.9.11 On Host, we have edit the guest XMl file and added for the multiple virtio console entry: <console type='pty'> <target type='virtio'/> </console> <console type='pty'> <target type='virtio'/> </console> We are able to connect to guest via serial console device. works fine. #virsh console guest We are unable to connect to guest via virtio console. Not working. #virsh console --devname console1 guest We login using the serial console into guest and check the lsmod command, So the virtio console driver module is not loaded. Also the getty process is not running for different virtio console devices. So i manually load the virtio console (virtio_console.ko) module -> Even then i am unable to login using the virtio console. In the guest, /dev/hvc[0-7] is present. Pls tell us whether we are missing any configuration or settings on Host/Guest side. Regards Pankaj Rawat DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

1 0

[libvirt] [PATCH] LXC: fix memory leak in lxcContainerMountFSBlockAuto
by Gao feng 11 Jun '12

11 Jun '12

we forgot to free fslist,just add VIR_FREE(fslist). Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index cd15ca4..297bd6d 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -969,6 +969,7 @@ retry: cleanup: VIR_FREE(line); + VIR_FREE(fslist); VIR_FORCE_FCLOSE(fp); return ret; } -- 1.7.7.6

2 1

[libvirt] [PATCH] LXC: fix incorrect parameter of mount in lxcContainerMountFSBind
by Gao feng 11 Jun '12

11 Jun '12

when do remount,the source and target should be the same values specified in the initial mount() call. So change fs->dst to src. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 506eb43..cd15ca4 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -744,7 +744,7 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr fs, if (fs->readonly) { VIR_DEBUG("Binding %s readonly", fs->dst); - if (mount(fs->dst, fs->dst, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) { + if (mount(src, fs->dst, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) { virReportSystemError(errno, _("Failed to make directory %s readonly"), fs->dst); -- 1.7.7.6

2 1

[libvirt] [PATCH] LXC: delete unused variable src in lxcContainerMountBasicFS
by Gao feng 11 Jun '12

11 Jun '12

there is no code use the variable "src" in lxcContainerMountBasicFS. so delete it and VIR_FREE. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index fb59694..506eb43 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -456,7 +456,6 @@ static int lxcContainerMountBasicFS(virDomainDefPtr def, VIR_DEBUG("Mounting basic filesystems pivotRoot=%d", pivotRoot); for (i = 0 ; i < ARRAY_CARDINALITY(mnts) ; i++) { - char *src = NULL; const char *srcpath = NULL; VIR_DEBUG("Processing %s -> %s", @@ -473,21 +472,17 @@ static int lxcContainerMountBasicFS(virDomainDefPtr def, /* Skip if mount doesn't exist in source */ if ((srcpath[0] == '/') && - (access(srcpath, R_OK) < 0)) { - VIR_FREE(src); + (access(srcpath, R_OK) < 0)) continue; - } VIR_DEBUG("Mount %s on %s type=%s flags=%x, opts=%s", srcpath, mnts[i].dst, mnts[i].type, mnts[i].mflags, mnts[i].opts); if (mount(srcpath, mnts[i].dst, mnts[i].type, mnts[i].mflags, mnts[i].opts) < 0) { - VIR_FREE(src); virReportSystemError(errno, _("Failed to mount %s on %s type %s"), mnts[i].src, mnts[i].dst, NULLSTR(mnts[i].type)); goto cleanup; } - VIR_FREE(src); } if (pivotRoot) { -- 1.7.7.6

2 1

[libvirt] [PATCH] msg_buf_size is unsigned long not size_t
by Guido Günther 10 Jun '12

10 Jun '12

This fixes the build on 32bit systems which otherwise fails with: virnetmessagetest.c: In function 'testMessageHeaderEncode': virnetmessagetest.c:75:9: error: format '%zu' expects argument of type 'size_t', but argument 7 has type 'long unsigned int' [-Werror=format] --- Probably o.k. to push under the build breaker rule but I'd rather check. Cheers, -- Guido tests/virnetmessagetest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index 6c294ca..0408b5b 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -72,7 +72,7 @@ static int testMessageHeaderEncode(const void *args ATTRIBUTE_UNUSED) } if (msg->bufferLength != msg_buf_size) { - VIR_DEBUG("Expect message offset %zu got %zu", + VIR_DEBUG("Expect message offset %lu got %zu", msg_buf_size, msg->bufferLength); goto cleanup; } -- 1.7.10

2 2

[libvirt] [PATCH 1/2] Add VSCSI bus type and VSCSI controller type for pseries guest.
by Li Zhang 10 Jun '12

10 Jun '12

Now, there is only SCSI bus and controller type in libvirt. And when configuring VSCSI controller, it needs to configure the spapr-vio bus address type externally. It's a little inconvenient to configure the controller type. This patch is to add VSCSI bus type and VSCSI controller type. And handle with the problems when VSCSI and SCSI devices working together, by assign the even number to index of VSCSI controller and odd number to index of SCSI controller. And when the VSCSI controller is always assigned as SPAPRVIO bus address type and SCSI controller will be always assigned as PCI bus address, which is implemented according to the controllers' type. So when one disk is based on VSCSI controller, then assign the bus as 'vscsi', and one right VSCSI controller will be selected. If one disk is based on VSCSI controller, the XML file is as the following: <disk type='file' device='disk' > <driver name='qemu' type='raw'/> <source file='/path/file'/> <target dev='sda' bus='vscsi'/> </disk> VSCSI controllers' configuration in XML file will be like this: <controller type='vscsi' index='0'> </controller> If one disk is based on 'vscsi', the 'vscsi' bus should be assigned externally. Otherwise, it will be set as 'scsi' bus according to the 'sd' target prefix of the disk. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 62 ++++++++++++++++++++++++++++++++++++++++++----- src/conf/domain_conf.h | 2 ++ src/qemu/qemu_command.c | 11 +++++++-- 3 files changed, 67 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 184ff23..99005b7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -177,7 +177,8 @@ VIR_ENUM_IMPL(virDomainDiskBus, VIR_DOMAIN_DISK_BUS_LAST, "xen", "usb", "uml", - "sata") + "sata", + "vscsi") VIR_ENUM_IMPL(virDomainDiskCache, VIR_DOMAIN_DISK_CACHE_LAST, "default", @@ -236,7 +237,8 @@ VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST, "sata", "virtio-serial", "ccid", - "usb") + "usb", + "vscsi") VIR_ENUM_IMPL(virDomainControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST, "auto", @@ -2973,6 +2975,7 @@ virDomainDiskDefAssignAddress(virCapsPtr caps, virDomainDiskDefPtr def) switch (def->bus) { case VIR_DOMAIN_DISK_BUS_SCSI: + case VIR_DOMAIN_DISK_BUS_VSCSI: def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE; if (caps->hasWideScsiBus) { @@ -2981,6 +2984,16 @@ virDomainDiskDefAssignAddress(virCapsPtr caps, virDomainDiskDefPtr def) * Unit 7 is the SCSI controller itself. Therefore unit 7 * cannot be assigned to disks and is skipped. */ + + /* assign even number to index of vscsi controller, + * and odd number to index of scsi controller, which can + * make vscsi controller and scsi controller work together. + */ + if (def->bus == VIR_DOMAIN_DISK_BUS_VSCSI) + def->info.addr.drive.controller = (idx / 15) * 2; + else + def->info.addr.drive.controller = (idx / 15) * 2 + 1; + def->info.addr.drive.controller = idx / 15; def->info.addr.drive.bus = 0; def->info.addr.drive.unit = idx % 15; @@ -2992,6 +3005,17 @@ virDomainDiskDefAssignAddress(virCapsPtr caps, virDomainDiskDefPtr def) } else { /* For a narrow SCSI bus we define the default mapping to be * 7 units per bus, 1 bus per controller, many controllers */ + + /* assign even number to index of vscsi controller, + * and odd number to index of scsi controller, which can + * make vscsi controller and scsi controller work together. + */ + + if (def->bus == VIR_DOMAIN_DISK_BUS_VSCSI) + def->info.addr.drive.controller = (idx / 7) * 2; + else + def->info.addr.drive.controller = (idx / 7 ) * 2 + 1; + def->info.addr.drive.controller = idx / 7; def->info.addr.drive.bus = 0; def->info.addr.drive.unit = idx % 7; @@ -4061,6 +4085,10 @@ virDomainControllerDefParseXML(xmlNodePtr node, break; } + case VIR_DOMAIN_CONTROLLER_TYPE_VSCSI: + def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; + break; + default: break; } @@ -7606,6 +7634,9 @@ static int virDomainDefMaybeAddController(virDomainDefPtr def, cont->idx = idx; cont->model = -1; + if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_VSCSI) + cont->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; + if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) { cont->opts.vioserial.ports = -1; cont->opts.vioserial.vectors = -1; @@ -10133,9 +10164,19 @@ static int virDomainDefAddDiskControllersForType(virDomainDefPtr def, maxController = def->disks[i]->info.addr.drive.controller; } - for (i = 0 ; i <= maxController ; i++) { - if (virDomainDefMaybeAddController(def, controllerType, i) < 0) - return -1; + /* To make scsi and vscsi can work together correctly, + * assign even number to index of vscsi controller + * and odd number of scsi controller.*/ + if (diskBus == VIR_DOMAIN_DISK_BUS_VSCSI) { + for (i = 0 ; i * 2 <= maxController ; i ++ ) { + if (virDomainDefMaybeAddController(def, controllerType, 2 * i) < 0) + return -1; + } + } else { + for (i = 0 ; i * 2 + 1 <= maxController ; i ++ ) { + if (virDomainDefMaybeAddController(def, controllerType, 2 * i + 1) < 0) + return -1; + } } return 0; @@ -10247,6 +10288,11 @@ int virDomainDefAddImplicitControllers(virDomainDefPtr def) VIR_DOMAIN_DISK_BUS_SATA) < 0) return -1; + if (virDomainDefAddDiskControllersForType(def, + VIR_DOMAIN_CONTROLLER_TYPE_VSCSI, + VIR_DOMAIN_DISK_BUS_VSCSI) < 0) + return -1; + if (virDomainDefMaybeAddVirtioSerialController(def) < 0) return -1; @@ -13175,7 +13221,11 @@ int virDiskNameToBusDeviceIndex(const virDomainDiskDefPtr disk, *devIdx = idx % 2; break; case VIR_DOMAIN_DISK_BUS_SCSI: - *busIdx = idx / 7; + *busIdx = (idx / 7) * 2 + 1; + *devIdx = idx % 7; + break; + case VIR_DOMAIN_DISK_BUS_VSCSI: + *busIdx = (idx / 7) * 2; *devIdx = idx % 7; break; case VIR_DOMAIN_DISK_BUS_FDC: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5aa8fc1..0066eba 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -418,6 +418,7 @@ enum virDomainDiskBus { VIR_DOMAIN_DISK_BUS_USB, VIR_DOMAIN_DISK_BUS_UML, VIR_DOMAIN_DISK_BUS_SATA, + VIR_DOMAIN_DISK_BUS_VSCSI, VIR_DOMAIN_DISK_BUS_LAST }; @@ -597,6 +598,7 @@ enum virDomainControllerType { VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL, VIR_DOMAIN_CONTROLLER_TYPE_CCID, VIR_DOMAIN_CONTROLLER_TYPE_USB, + VIR_DOMAIN_CONTROLLER_TYPE_VSCSI, VIR_DOMAIN_CONTROLLER_TYPE_LAST }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 070d13e..bb3be17 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -57,7 +57,8 @@ VIR_ENUM_IMPL(virDomainDiskQEMUBus, VIR_DOMAIN_DISK_BUS_LAST, "xen", "usb", "uml", - "sata") + "sata", + "vscsi") VIR_ENUM_DECL(qemuDiskCacheV1) @@ -429,6 +430,7 @@ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk) ret = virAsprintf(&dev_name, "ide%d-cd%d", busid, devid); break; case VIR_DOMAIN_DISK_BUS_SCSI: + case VIR_DOMAIN_DISK_BUS_VSCSI: if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) ret = virAsprintf(&dev_name, "scsi%d-hd%d", busid, devid); else @@ -1836,6 +1838,7 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_SCSI: + case VIR_DOMAIN_DISK_BUS_VSCSI: if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected address type for scsi disk")); @@ -2223,6 +2226,7 @@ qemuBuildDriveDevStr(virDomainDefPtr def, disk->info.addr.drive.unit); break; case VIR_DOMAIN_DISK_BUS_SCSI: + case VIR_DOMAIN_DISK_BUS_VSCSI: if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { if (!qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_BLOCK)) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -6447,6 +6451,8 @@ qemuParseCommandLineDisk(virCapsPtr caps, def->bus = VIR_DOMAIN_DISK_BUS_IDE; else if (STREQ(values[i], "scsi")) def->bus = VIR_DOMAIN_DISK_BUS_SCSI; + else if (STREQ(values[i], "vscsi")) + def->bus = VIR_DOMAIN_DISK_BUS_VSCSI; else if (STREQ(values[i], "virtio")) def->bus = VIR_DOMAIN_DISK_BUS_VIRTIO; else if (STREQ(values[i], "xen")) @@ -6577,7 +6583,8 @@ qemuParseCommandLineDisk(virCapsPtr caps, if (def->bus == VIR_DOMAIN_DISK_BUS_IDE) { def->dst = strdup("hda"); - } else if (def->bus == VIR_DOMAIN_DISK_BUS_SCSI) { + } else if (def->bus == VIR_DOMAIN_DISK_BUS_SCSI || + def->bus == VIR_DOMAIN_DISK_BUS_VSCSI) { def->dst = strdup("sda"); } else if (def->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) { def->dst = strdup("vda"); -- 1.7.9.5

6 16

[libvirt] [libvirt-php PATCH 1/2] Fix building with threaded php
by Tiziano Müller 10 Jun '12

10 Jun '12

--- src/libvirt-php.c | 344 +++++++++++++++++++++++++++-------------------------- src/libvirt-php.h | 2 +- 2 files changed, 174 insertions(+), 172 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 20e5d27..c50fd74 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -229,14 +229,14 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("libvirt.max_connections", "5", PHP_INI_ALL, OnUpdateString, max_connections_ini, zend_libvirt_globals, libvirt_globals) PHP_INI_END() -void change_debug(int val) +void change_debug(int val TSRMLS_DC) { LIBVIRT_G(debug) = val; gdebug = val; } /* PHP requires to have this function defined */ -static void php_libvirt_init_globals(zend_libvirt_globals *libvirt_globals) +static void php_libvirt_init_globals(zend_libvirt_globals *libvirt_globals TSRMLS_DC) { libvirt_globals->longlong_to_string_ini = 1; libvirt_globals->iso_path_ini = "/var/lib/libvirt/images/iso"; @@ -246,7 +246,7 @@ static void php_libvirt_init_globals(zend_libvirt_globals *libvirt_globals) libvirt_globals->binding_resources = NULL; #ifdef DEBUG_SUPPORT libvirt_globals->debug = 0; - change_debug(0); + change_debug(0 TSRMLS_CC); #endif } @@ -255,7 +255,7 @@ PHP_RINIT_FUNCTION(libvirt) { LIBVIRT_G(last_error) = NULL; LIBVIRT_G(vnc_location) = NULL; - change_debug(0); + change_debug(0 TSRMLS_CC); #if __BYTE_ORDER == __BIG_ENDIAN _is_bigendian = 1; #elif __BYTE_ORDER == __LITTLE_ENDIAN @@ -306,13 +306,13 @@ char *get_datetime(void) @maxsize [long]: integer value of maximum file size, file will be truncated after reaching max file size. Value is set in KiB. Returns: 0 on success, -errno otherwise */ -int set_logfile(char *filename, long maxsize) +int set_logfile(char *filename, long maxsize TSRMLS_DC) { int res; struct stat st; if (filename == NULL) { - change_debug(0); + change_debug(0 TSRMLS_CC); return 0; } @@ -326,7 +326,7 @@ int set_logfile(char *filename, long maxsize) res = (freopen(filename, "a", stderr) != NULL) ? 0 : -errno; if (res == 0) - change_debug(1); + change_debug(1 TSRMLS_CC); return res; } @@ -369,7 +369,7 @@ char *translate_counter_type(int type) @inc [int/bool]: Increment the counter (1 = add memory location) or decrement the counter (0 = remove memory location) from entries. Returns: 0 on success, -errno otherwise */ -int resource_change_counter(int type, virConnectPtr conn, void *memp, int inc) +int resource_change_counter(int type, virConnectPtr conn, void *memp, int inc TSRMLS_DC) { int i; int pos = -1; @@ -591,7 +591,7 @@ void set_vnc_location(char *msg TSRMLS_DC) void set_error_if_unset(char *msg TSRMLS_DC) { if (LIBVIRT_G (last_error) == NULL) - set_error(msg); + set_error(msg TSRMLS_CC); } /* @@ -601,9 +601,9 @@ void set_error_if_unset(char *msg TSRMLS_DC) Arguments: None Returns: None */ -void reset_error() +void reset_error(TSRMLS_D) { - set_error(NULL); + set_error(NULL TSRMLS_CC); } @@ -623,7 +623,7 @@ static void catch_error(void *userData, @mem [uint]: memory location of the resource to be freed Returns: None */ -void free_resource(int type, arch_uint mem) +void free_resource(int type, arch_uint mem TSRMLS_DC) { int rv; @@ -637,7 +637,7 @@ void free_resource(int type, arch_uint mem) } else { DPRINTF("%s: virDomainFree(%p) completed successfully\n", __FUNCTION__, (virDomainPtr)mem); - resource_change_counter(INT_RESOURCE_DOMAIN, NULL, (virDomainPtr)mem, 0); + resource_change_counter(INT_RESOURCE_DOMAIN, NULL, (virDomainPtr)mem, 0 TSRMLS_CC); } } @@ -649,7 +649,7 @@ void free_resource(int type, arch_uint mem) } else { DPRINTF("%s: virNetworkFree(%p) completed successfully\n", __FUNCTION__, (virNetworkPtr)mem); - resource_change_counter(INT_RESOURCE_NETWORK, NULL, (virNetworkPtr)mem, 0); + resource_change_counter(INT_RESOURCE_NETWORK, NULL, (virNetworkPtr)mem, 0 TSRMLS_CC); } } @@ -661,7 +661,7 @@ void free_resource(int type, arch_uint mem) } else { DPRINTF("%s: virNodeDeviceFree(%p) completed successfully\n", __FUNCTION__, (virNodeDevicePtr)mem); - resource_change_counter(INT_RESOURCE_NODEDEV, NULL, (virNodeDevicePtr)mem, 0); + resource_change_counter(INT_RESOURCE_NODEDEV, NULL, (virNodeDevicePtr)mem, 0 TSRMLS_CC); } } @@ -673,7 +673,7 @@ void free_resource(int type, arch_uint mem) } else { DPRINTF("%s: virStoragePoolFree(%p) completed successfully\n", __FUNCTION__, (virStoragePoolPtr)mem); - resource_change_counter(INT_RESOURCE_STORAGEPOOL, NULL, (virStoragePoolPtr)mem, 0); + resource_change_counter(INT_RESOURCE_STORAGEPOOL, NULL, (virStoragePoolPtr)mem, 0 TSRMLS_CC); } } @@ -685,7 +685,7 @@ void free_resource(int type, arch_uint mem) } else { DPRINTF("%s: virStorageVolFree(%p) completed successfully\n", __FUNCTION__, (virStorageVolPtr)mem); - resource_change_counter(INT_RESOURCE_VOLUME, NULL, (virStorageVolPtr)mem, 0); + resource_change_counter(INT_RESOURCE_VOLUME, NULL, (virStorageVolPtr)mem, 0 TSRMLS_CC); } } @@ -698,7 +698,7 @@ void free_resource(int type, arch_uint mem) } else { DPRINTF("%s: virDomainSnapshotFree(%p) completed successfully\n", __FUNCTION__, (virDomainSnapshotPtr)mem); - resource_change_counter(INT_RESOURCE_SNAPSHOT, NULL, (virDomainSnapshotPtr)mem, 0); + resource_change_counter(INT_RESOURCE_SNAPSHOT, NULL, (virDomainSnapshotPtr)mem, 0 TSRMLS_CC); } } #endif @@ -711,7 +711,7 @@ void free_resource(int type, arch_uint mem) Arguments: @conn [virConnectPtr]: libvirt connection pointer Returns: None */ -void free_resources_on_connection(virConnectPtr conn) +void free_resources_on_connection(virConnectPtr conn TSRMLS_DC) { int binding_resources_count = 0; resource_info *binding_resources; @@ -722,7 +722,7 @@ void free_resources_on_connection(virConnectPtr conn) for (i = 0; i < binding_resources_count; i++) { if ((binding_resources[i].overwrite == 0) && (binding_resources[i].conn == conn)) - free_resource(binding_resources[i].type, binding_resources[i].mem); + free_resource(binding_resources[i].type, binding_resources[i].mem TSRMLS_CC); } } @@ -735,7 +735,7 @@ void free_resources_on_connection(virConnectPtr conn) @memp [pointer]: pointer to the memory Returns: 1 if resource is allocated, 0 otherwise */ -int check_resource_allocation(virConnectPtr conn, int type, void *memp) +int check_resource_allocation(virConnectPtr conn, int type, void *memp TSRMLS_DC) { int binding_resources_count = 0; resource_info *binding_resources = NULL; @@ -771,7 +771,7 @@ int check_resource_allocation(virConnectPtr conn, int type, void *memp) Arguments: @type [int]: integer interpretation of the type, see free_resource() API function for possible values Returns: number of resources already used */ -int count_resources(int type) +int count_resources(int type TSRMLS_DC) { int binding_resources_count = 0; resource_info *binding_resources = NULL; @@ -850,7 +850,7 @@ static void php_libvirt_connection_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { if (conn->conn != NULL) { - free_resources_on_connection(conn->conn); + free_resources_on_connection(conn->conn TSRMLS_CC); rv = virConnectClose(conn->conn); if (rv!=0) { @@ -859,7 +859,7 @@ static void php_libvirt_connection_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) } else { DPRINTF("%s: virConnectClose(%p) completed successfully\n", __FUNCTION__, conn->conn); - resource_change_counter(INT_RESOURCE_CONNECTION, NULL, conn->conn, 0); + resource_change_counter(INT_RESOURCE_CONNECTION, NULL, conn->conn, 0 TSRMLS_CC); } conn->conn=NULL; } @@ -877,7 +877,7 @@ static void php_libvirt_domain_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { if (domain->domain != NULL) { - if (!check_resource_allocation(domain->conn->conn, INT_RESOURCE_DOMAIN, domain->domain)) { + if (!check_resource_allocation(domain->conn->conn, INT_RESOURCE_DOMAIN, domain->domain TSRMLS_CC)) { domain->domain=NULL; efree (domain); return; @@ -890,7 +890,7 @@ static void php_libvirt_domain_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) } else { DPRINTF("%s: virDomainFree(%p) completed successfully\n", __FUNCTION__, domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, domain->conn->conn, domain->domain, 0); + resource_change_counter(INT_RESOURCE_DOMAIN, domain->conn->conn, domain->domain, 0 TSRMLS_CC); } domain->domain=NULL; } @@ -908,7 +908,7 @@ static void php_libvirt_storagepool_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { if (pool->pool != NULL) { - if (!check_resource_allocation(NULL, INT_RESOURCE_STORAGEPOOL, pool->pool)) { + if (!check_resource_allocation(NULL, INT_RESOURCE_STORAGEPOOL, pool->pool TSRMLS_CC)) { pool->pool=NULL; efree(pool); return; @@ -920,7 +920,7 @@ static void php_libvirt_storagepool_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) } else { DPRINTF("%s: virStoragePoolFree(%p) completed successfully\n", __FUNCTION__, pool->pool); - resource_change_counter(INT_RESOURCE_STORAGEPOOL, NULL, pool->pool, 0); + resource_change_counter(INT_RESOURCE_STORAGEPOOL, NULL, pool->pool, 0 TSRMLS_CC); } pool->pool=NULL; } @@ -938,7 +938,7 @@ static void php_libvirt_volume_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { if (volume->volume != NULL) { - if (!check_resource_allocation(NULL, INT_RESOURCE_VOLUME, volume->volume)) { + if (!check_resource_allocation(NULL, INT_RESOURCE_VOLUME, volume->volume TSRMLS_CC)) { volume->volume=NULL; efree(volume); return; @@ -950,7 +950,7 @@ static void php_libvirt_volume_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) } else { DPRINTF("%s: virStorageVolFree(%p) completed successfully\n", __FUNCTION__, volume->volume); - resource_change_counter(INT_RESOURCE_VOLUME, NULL, volume->volume, 0); + resource_change_counter(INT_RESOURCE_VOLUME, NULL, volume->volume, 0 TSRMLS_CC); } volume->volume=NULL; } @@ -968,7 +968,7 @@ static void php_libvirt_network_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { if (network->network != NULL) { - if (!check_resource_allocation(network->conn->conn, INT_RESOURCE_NETWORK, network->network)) { + if (!check_resource_allocation(network->conn->conn, INT_RESOURCE_NETWORK, network->network TSRMLS_CC)) { network->network=NULL; efree(network); return; @@ -980,7 +980,7 @@ static void php_libvirt_network_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) } else { DPRINTF("%s: virNetworkFree(%p) completed successfully\n", __FUNCTION__, network->network); - resource_change_counter(INT_RESOURCE_NETWORK, NULL, network->network, 0); + resource_change_counter(INT_RESOURCE_NETWORK, NULL, network->network, 0 TSRMLS_CC); } network->network=NULL; } @@ -998,7 +998,7 @@ static void php_libvirt_nodedev_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { if (nodedev->device != NULL) { - if (!check_resource_allocation(nodedev->conn->conn, INT_RESOURCE_NODEDEV, nodedev->device)) { + if (!check_resource_allocation(nodedev->conn->conn, INT_RESOURCE_NODEDEV, nodedev->device TSRMLS_CC)) { nodedev->device=NULL; efree(nodedev); return; @@ -1010,7 +1010,7 @@ static void php_libvirt_nodedev_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) } else { DPRINTF("%s: virNodeDeviceFree(%p) completed successfully\n", __FUNCTION__, nodedev->device); - resource_change_counter(INT_RESOURCE_NODEDEV, nodedev->conn->conn, nodedev->device, 0); + resource_change_counter(INT_RESOURCE_NODEDEV, nodedev->conn->conn, nodedev->device, 0 TSRMLS_CC); } nodedev->device=NULL; } @@ -1029,7 +1029,7 @@ static void php_libvirt_snapshot_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { if (snapshot->snapshot != NULL) { - if (!check_resource_allocation(snapshot->domain->conn->conn, INT_RESOURCE_SNAPSHOT, snapshot->snapshot)) { + if (!check_resource_allocation(snapshot->domain->conn->conn, INT_RESOURCE_SNAPSHOT, snapshot->snapshot TSRMLS_CC)) { snapshot->snapshot=NULL; efree(snapshot); return; @@ -1041,7 +1041,7 @@ static void php_libvirt_snapshot_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) } else { DPRINTF("%s: virDomainSnapshotFree(%p) completed successfully\n", __FUNCTION__, snapshot->snapshot); - resource_change_counter(INT_RESOURCE_SNAPSHOT, snapshot->domain->conn->conn, snapshot->snapshot, 0); + resource_change_counter(INT_RESOURCE_SNAPSHOT, snapshot->domain->conn->conn, snapshot->snapshot, 0 TSRMLS_CC); } snapshot->snapshot=NULL; } @@ -1219,9 +1219,9 @@ PHP_MSHUTDOWN_FUNCTION(libvirt) /* Macros for obtaining resources from arguments */ #define GET_CONNECTION_FROM_ARGS(args, ...) \ - reset_error(); \ + reset_error(TSRMLS_C); \ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, args, __VA_ARGS__) == FAILURE) {\ - set_error("Invalid arguments"); \ + set_error("Invalid arguments" TSRMLS_CC); \ RETURN_FALSE;\ }\ \ @@ -1229,9 +1229,9 @@ PHP_MSHUTDOWN_FUNCTION(libvirt) if ((conn==NULL) || (conn->conn==NULL)) RETURN_FALSE;\ #define GET_DOMAIN_FROM_ARGS(args, ...) \ - reset_error(); \ + reset_error(TSRMLS_C); \ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, args, __VA_ARGS__) == FAILURE) {\ - set_error("Invalid arguments"); \ + set_error("Invalid arguments" TSRMLS_CC); \ RETURN_FALSE;\ }\ \ @@ -1239,9 +1239,9 @@ PHP_MSHUTDOWN_FUNCTION(libvirt) if ((domain==NULL) || (domain->domain==NULL)) RETURN_FALSE;\ #define GET_NETWORK_FROM_ARGS(args, ...) \ - reset_error(); \ + reset_error(TSRMLS_C); \ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, args, __VA_ARGS__) == FAILURE) {\ - set_error("Invalid arguments");\ + set_error("Invalid arguments" TSRMLS_CC);\ RETURN_FALSE;\ }\ \ @@ -1249,9 +1249,9 @@ PHP_MSHUTDOWN_FUNCTION(libvirt) if ((network==NULL) || (network->network==NULL)) RETURN_FALSE;\ #define GET_NODEDEV_FROM_ARGS(args, ...) \ - reset_error(); \ + reset_error(TSRMLS_C); \ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, args, __VA_ARGS__) == FAILURE) {\ - set_error("Invalid arguments");\ + set_error("Invalid arguments" TSRMLS_CC);\ RETURN_FALSE;\ }\ \ @@ -1259,9 +1259,9 @@ PHP_MSHUTDOWN_FUNCTION(libvirt) if ((nodedev==NULL) || (nodedev->device==NULL)) RETURN_FALSE;\ #define GET_STORAGEPOOL_FROM_ARGS(args, ...) \ - reset_error(); \ + reset_error(TSRMLS_C); \ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, args, __VA_ARGS__) == FAILURE) {\ - set_error("Invalid arguments");\ + set_error("Invalid arguments" TSRMLS_CC);\ RETURN_FALSE;\ }\ \ @@ -1269,9 +1269,9 @@ PHP_MSHUTDOWN_FUNCTION(libvirt) if ((pool==NULL) || (pool->pool==NULL)) RETURN_FALSE;\ #define GET_VOLUME_FROM_ARGS(args, ...) \ - reset_error(); \ + reset_error(TSRMLS_C); \ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, args, __VA_ARGS__) == FAILURE) {\ - set_error("Invalid arguments");\ + set_error("Invalid arguments" TSRMLS_CC);\ RETURN_FALSE;\ }\ \ @@ -1281,9 +1281,9 @@ PHP_MSHUTDOWN_FUNCTION(libvirt) #if LIBVIR_VERSION_NUMBER>=8000 #define GET_SNAPSHOT_FROM_ARGS(args, ...) \ - reset_error(); \ + reset_error(TSRMLS_C); \ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, args, __VA_ARGS__) == FAILURE) {\ - set_error("Invalid arguments");\ + set_error("Invalid arguments" TSRMLS_CC);\ RETURN_FALSE;\ }\ \ @@ -1323,6 +1323,8 @@ str_out = estrndup(str_in, strlen(str_in)); \ /* Authentication callback function. Should receive list of credentials via cbdata and pass the requested one to libvirt */ static int libvirt_virConnectAuthCallback(virConnectCredentialPtr cred, unsigned int ncred, void *cbdata) { + TSRMLS_FETCH(); + int i,j; php_libvirt_cred_value *creds=(php_libvirt_cred_value*) cbdata; for(i=0;i<ncred;i++) @@ -1416,7 +1418,7 @@ PHP_FUNCTION(libvirt_connect) RETURN_FALSE; } - if ((count_resources(INT_RESOURCE_CONNECTION) + 1) > atoi(LIBVIRT_G(max_connections_ini))) { + if ((count_resources(INT_RESOURCE_CONNECTION TSRMLS_CC) + 1) > atoi(LIBVIRT_G(max_connections_ini))) { DPRINTF("%s: maximum number of connections allowed exceeded (max %s)\n",PHPFUNC, LIBVIRT_G(max_connections_ini)); set_error("Maximum number of connections allowed exceeded" TSRMLS_CC); RETURN_FALSE; @@ -1476,7 +1478,7 @@ PHP_FUNCTION(libvirt_connect) RETURN_FALSE; } - resource_change_counter(INT_RESOURCE_CONNECTION, NULL, conn->conn, 1); + resource_change_counter(INT_RESOURCE_CONNECTION, NULL, conn->conn, 1 TSRMLS_CC); DPRINTF("%s: Connection to %s established, returning %p\n", PHPFUNC, url, conn->conn); ZEND_REGISTER_RESOURCE(return_value, conn, le_libvirt_connection); @@ -1668,7 +1670,7 @@ PHP_FUNCTION(libvirt_image_create) path = strdup( LIBVIRT_G(image_path_ini) ); if ((path == NULL) || (path[0] != '/')) { - set_error("Invalid argument, path must be set and absolute (start by slash character [/])"); + set_error("Invalid argument, path must be set and absolute (start by slash character [/])" TSRMLS_CC); RETURN_FALSE; } @@ -1682,7 +1684,7 @@ PHP_FUNCTION(libvirt_image_create) if (!is_local_connection(conn->conn)) { // TODO: Try to implement remote connection somehow. Maybe using SSH tunneling snprintf(msg, sizeof(msg), "%s works only on local systems!", PHPFUNC); - set_error(msg); + set_error(msg TSRMLS_CC); RETURN_FALSE; } @@ -1690,7 +1692,7 @@ PHP_FUNCTION(libvirt_image_create) char *qemu_img_cmd = get_feature_binary("create-image"); if (qemu_img_cmd == NULL) { - set_error("Feature 'create-image' is not supported"); + set_error("Feature 'create-image' is not supported" TSRMLS_CC); RETURN_FALSE; } @@ -1704,7 +1706,7 @@ PHP_FUNCTION(libvirt_image_create) } else { snprintf(msg, sizeof(msg), "Cannot create image: %s", fpath); - set_error(msg); + set_error(msg TSRMLS_CC); RETURN_FALSE; } } @@ -1735,13 +1737,13 @@ PHP_FUNCTION(libvirt_image_remove) gethostname(name, 1024); if (strcmp(name, hostname) != 0) { snprintf(msg, sizeof(msg), "%s works only on local systems!", PHPFUNC); - set_error(msg); + set_error(msg TSRMLS_CC); RETURN_FALSE; } if (unlink(image) != 0) { snprintf(msg, sizeof(msg), "An error occured while unlinking %s: %d (%s)", image, errno, strerror(errno)); - set_error(msg); + set_error(msg TSRMLS_CC); RETURN_FALSE; } else { @@ -1870,7 +1872,7 @@ PHP_FUNCTION(libvirt_connect_get_sysinfo) #else PHP_FUNCTION(libvirt_connect_get_sysinfo) { - set_error("Only libvirt 0.8.8 or higher supports virConnectGetSysinfo() API function"); + set_error("Only libvirt 0.8.8 or higher supports virConnectGetSysinfo() API function" TSRMLS_CC); RETURN_FALSE; } #endif @@ -2121,7 +2123,7 @@ long get_next_free_numeric_value(virDomainPtr domain, char *xpath) @arch [string]: optional architecture string, can be NULL to get default Returns: path to the emulator */ -char *connection_get_domain_type(virConnectPtr conn, char *arch) +char *connection_get_domain_type(virConnectPtr conn, char *arch TSRMLS_DC) { int retval = -1; char *tmp = NULL; @@ -2162,7 +2164,7 @@ char *connection_get_domain_type(virConnectPtr conn, char *arch) @arch [string]: optional architecture string, can be NULL to get default Returns: path to the emulator */ -char *connection_get_emulator(virConnectPtr conn, char *arch) +char *connection_get_emulator(virConnectPtr conn, char *arch TSRMLS_DC) { int retval = -1; char *tmp = NULL; @@ -2214,7 +2216,7 @@ char *connection_get_emulator(virConnectPtr conn, char *arch) Arguments: @conn [virConnectPtr]: libvirt connection pointer of connection to get architecture for Returns: path to the emulator */ -char *connection_get_arch(virConnectPtr conn) +char *connection_get_arch(virConnectPtr conn TSRMLS_DC) { int retval = -1; char *tmp = NULL; @@ -2270,7 +2272,7 @@ char *generate_uuid_any() Arguments: @conn [virConnectPtr]: libvirt connection pointer Returns: a new unused random UUID string */ -char *generate_uuid(virConnectPtr conn) +char *generate_uuid(virConnectPtr conn TSRMLS_DC) { virDomainPtr domain=NULL; char *uuid = NULL; @@ -2300,7 +2302,7 @@ char *generate_uuid(virConnectPtr conn) @disk_flags [int]: disk type, VIR_DOMAIN_DISK_FILE or VIR_DOMAIN_DISK_BLOCK Returns: XML output for the disk */ -char *get_disk_xml(unsigned long long size, char *path, char *driver, char *bus, char *dev, int disk_flags) +char *get_disk_xml(unsigned long long size, char *path, char *driver, char *bus, char *dev, int disk_flags TSRMLS_DC) { char xml[4096] = { 0 }; @@ -2409,7 +2411,7 @@ char *get_network_xml(char *mac, char *network, char *model) Returns: full XML output for installation */ char *installation_get_xml(int step, virConnectPtr conn, char *name, int memMB, int maxmemMB, char *arch, char *uuid, int vCpus, char *iso_image, - tVMDisk *disks, int numDisks, tVMNetwork *networks, int numNetworks, int domain_flags) + tVMDisk *disks, int numDisks, tVMNetwork *networks, int numNetworks, int domain_flags TSRMLS_DC) { int i; char xml[32768] = { 0 }; @@ -2426,7 +2428,7 @@ char *installation_get_xml(int step, virConnectPtr conn, char *name, int memMB, } if (uuid == NULL) - uuid = generate_uuid(conn); + uuid = generate_uuid(conn TSRMLS_CC); if (domain_flags & DOMAIN_FLAG_FEATURE_ACPI) strcat(features, "<acpi/>"); @@ -2436,7 +2438,7 @@ char *installation_get_xml(int step, virConnectPtr conn, char *name, int memMB, strcat(features, "<pae/>"); if (arch == NULL) { - arch = connection_get_arch(conn); + arch = connection_get_arch(conn TSRMLS_CC); DPRINTF("%s: No architecture defined, got host arch of '%s'\n", __FUNCTION__, arch); } @@ -2445,12 +2447,12 @@ char *installation_get_xml(int step, virConnectPtr conn, char *name, int memMB, return NULL; } - tmp = connection_get_domain_type(conn, arch); + tmp = connection_get_domain_type(conn, arch TSRMLS_CC); if (tmp != NULL) snprintf(type, sizeof(type), " type='%s'", tmp); for (i = 0; i < numDisks; i++) { - char *disk = get_disk_xml(disks[i].size, disks[i].path, disks[i].driver, disks[i].bus, disks[i].dev, disks[i].flags); + char *disk = get_disk_xml(disks[i].size, disks[i].path, disks[i].driver, disks[i].bus, disks[i].dev, disks[i].flags TSRMLS_CC); if (disk != NULL) strcat(disks_xml, disk); @@ -2507,7 +2509,7 @@ char *installation_get_xml(int step, virConnectPtr conn, char *name, int memMB, "</domain>", type, name, memMB * 1024, maxmemMB * 1024, uuid, arch, features, (domain_flags & DOMAIN_FLAG_CLOCK_LOCALTIME ? "localtime" : "utc"), - vCpus, connection_get_emulator(conn, arch), disks_xml, iso_image, networks_xml, + vCpus, connection_get_emulator(conn, arch TSRMLS_CC), disks_xml, iso_image, networks_xml, (domain_flags & DOMAIN_FLAG_SOUND_AC97 ? "\t\t<sound model='ac97'/>\n" : "") ); else @@ -2549,7 +2551,7 @@ char *installation_get_xml(int step, virConnectPtr conn, char *name, int memMB, "</domain>", type, name, memMB * 1024, maxmemMB * 1024, uuid, arch, features, (domain_flags & DOMAIN_FLAG_CLOCK_LOCALTIME ? "localtime" : "utc"), - vCpus, connection_get_emulator(conn, arch), disks_xml, networks_xml, + vCpus, connection_get_emulator(conn, arch TSRMLS_CC), disks_xml, networks_xml, (domain_flags & DOMAIN_FLAG_SOUND_AC97 ? "\t\t<sound model='ac97'/>\n" : "") ); @@ -2672,7 +2674,7 @@ PHP_FUNCTION(libvirt_domain_lookup_by_name) res_domain->conn = conn; DPRINTF("%s: domain name = '%s', returning %p\n", PHPFUNC, name, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -2704,7 +2706,7 @@ PHP_FUNCTION(libvirt_domain_lookup_by_uuid) res_domain->conn=conn; DPRINTF("%s: domain UUID = '%s', returning %p\n", PHPFUNC, uuid, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -2737,7 +2739,7 @@ PHP_FUNCTION(libvirt_domain_lookup_by_uuid_string) res_domain->conn=conn; DPRINTF("%s: domain UUID string = '%s', returning %p\n", PHPFUNC, uuid, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -2767,7 +2769,7 @@ PHP_FUNCTION(libvirt_domain_lookup_by_id) res_domain->conn=conn; DPRINTF("%s: domain id = '%d', returning %p\n", PHPFUNC, (int)id, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -2859,13 +2861,13 @@ PHP_FUNCTION(libvirt_domain_get_screenshot) xml=virDomainGetXMLDesc(domain->domain, 0); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } tmp = get_string_from_xpath(xml, "//domain/devices/graphics/@port", NULL, &retval); if ((tmp == NULL) || (retval < 0)) { - set_error("Cannot get the VNC port"); + set_error("Cannot get the VNC port" TSRMLS_CC); RETURN_FALSE; } @@ -2883,7 +2885,7 @@ PHP_FUNCTION(libvirt_domain_get_screenshot) DPRINTF("%s: Binary not found, using builtin approach to %s:%s, tmp file = %s\n", PHPFUNC, hostname, tmp, file); if (vnc_get_bitmap(hostname, tmp, file) != 0) { - set_error("Cannot use builtin approach to get VNC window contents"); + set_error("Cannot use builtin approach to get VNC window contents" TSRMLS_CC); RETURN_FALSE; } @@ -2914,7 +2916,7 @@ PHP_FUNCTION(libvirt_domain_get_screenshot) } if (WEXITSTATUS(retval) != 0) { - set_error("Cannot spawn utility to get screenshot"); + set_error("Cannot spawn utility to get screenshot" TSRMLS_CC); RETURN_FALSE; } } @@ -2967,13 +2969,13 @@ PHP_FUNCTION(libvirt_domain_get_screen_dimensions) xml=virDomainGetXMLDesc(domain->domain, 0); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } tmp = get_string_from_xpath(xml, "//domain/devices/graphics/@port", NULL, &retval); if ((tmp == NULL) || (retval < 0)) { - set_error("Cannot get the VNC port"); + set_error("Cannot get the VNC port" TSRMLS_CC); RETURN_FALSE; } @@ -2987,7 +2989,7 @@ PHP_FUNCTION(libvirt_domain_get_screen_dimensions) else snprintf(error, sizeof(error), "Cannot get screen dimensions, error code = %d (%s)", ret, strerror(-ret)); - set_error(error); + set_error(error TSRMLS_CC); RETURN_FALSE; } @@ -3024,13 +3026,13 @@ PHP_FUNCTION(libvirt_domain_send_keys) xml=virDomainGetXMLDesc(domain->domain, 0); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } tmp = get_string_from_xpath(xml, "//domain/devices/graphics/@port", NULL, &retval); if ((tmp == NULL) || (retval < 0)) { - set_error("Cannot get the VNC port"); + set_error("Cannot get the VNC port" TSRMLS_CC); RETURN_FALSE; } @@ -3045,7 +3047,7 @@ PHP_FUNCTION(libvirt_domain_send_keys) else { char tmpp[64] = { 0 }; snprintf(tmpp, sizeof(tmpp), "Cannot send keys, error code %d", ret); - set_error(tmpp); + set_error(tmpp TSRMLS_CC); RETURN_FALSE; } } @@ -3081,13 +3083,13 @@ PHP_FUNCTION(libvirt_domain_send_pointer_event) xml=virDomainGetXMLDesc(domain->domain, 0); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } tmp = get_string_from_xpath(xml, "//domain/devices/graphics/@port", NULL, &retval); if ((tmp == NULL) || (retval < 0)) { - set_error("Cannot get the VNC port"); + set_error("Cannot get the VNC port" TSRMLS_CC); RETURN_FALSE; } @@ -3104,7 +3106,7 @@ PHP_FUNCTION(libvirt_domain_send_pointer_event) else snprintf(error, sizeof(error), "Cannot send pointer event, error code = %d (%s)", ret, strerror(-ret)); - set_error(error); + set_error(error TSRMLS_CC); RETURN_FALSE; } } @@ -3242,9 +3244,9 @@ PHP_FUNCTION(libvirt_connect_get_emulator) if ((arch == NULL) || (arch_len == 0)) arch = NULL; - tmp = connection_get_emulator(conn->conn, arch); + tmp = connection_get_emulator(conn->conn, arch TSRMLS_CC); if (tmp == NULL) { - set_error("Cannot get emulator"); + set_error("Cannot get emulator" TSRMLS_CC); RETURN_FALSE; } @@ -3422,16 +3424,16 @@ PHP_FUNCTION(libvirt_domain_new) tmp = installation_get_xml(1, conn->conn, tmpname, memMB, maxmemMB, NULL /* arch */, NULL, vcpus, iso_image, vmDisks, numDisks, vmNetworks, numNets, - flags); + flags TSRMLS_CC); if (tmp == NULL) { DPRINTF("%s: Cannot get installation XML\n", PHPFUNC); - set_error("Cannot get installation XML"); + set_error("Cannot get installation XML" TSRMLS_CC); RETURN_FALSE; } domain = virDomainCreateXML(conn->conn, tmp, 0); if (domain == NULL) { - set_error_if_unset("Cannot create installation domain from the XML description"); + set_error_if_unset("Cannot create installation domain from the XML description" TSRMLS_CC); DPRINTF("%s: Cannot create installation domain from the XML description (%s): %s\n", PHPFUNC, LIBVIRT_G(last_error), tmp); RETURN_FALSE; } @@ -3439,14 +3441,14 @@ PHP_FUNCTION(libvirt_domain_new) xml = virDomainGetXMLDesc(domain, 0); if (xml == NULL) { DPRINTF("%s: Cannot get the XML description\n", PHPFUNC); - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } tmp = get_string_from_xpath(xml, "//domain/devices/graphics[@type='vnc']/@port", NULL, &retval); if (retval < 0) { DPRINTF("%s: Cannot get port from XML description\n", PHPFUNC); - set_error_if_unset("Cannot get port from XML description"); + set_error_if_unset("Cannot get port from XML description" TSRMLS_CC); RETURN_FALSE; } @@ -3458,30 +3460,30 @@ PHP_FUNCTION(libvirt_domain_new) snprintf(vncl, sizeof(vncl), "Connection failed, port %s is most likely forbidden on firewall (iptables) on the host (%s)" " or the emulator VNC server is bound to localhost address only.", tmp, virConnectGetHostname(conn->conn)); - set_vnc_location(vncl); + set_vnc_location(vncl TSRMLS_CC); } else { close(fd); DPRINTF("%s: Connection to '%s' successfull (%s local connection)\n", PHPFUNC, vncl, (flags & DOMAIN_FLAG_TEST_LOCAL_VNC) ? "using" : "not using"); - set_vnc_location(vncl); + set_vnc_location(vncl TSRMLS_CC); DPRINTF("%s: VNC server location set to '%s'\n", PHPFUNC, vncl); } tmp = installation_get_xml(2, conn->conn, name, memMB, maxmemMB, NULL /* arch */, NULL, vcpus, iso_image, vmDisks, numDisks, vmNetworks, numNets, - flags); + flags TSRMLS_CC); if (tmp == NULL) { DPRINTF("%s: Cannot get installation XML, step 2\n", PHPFUNC); - set_error("Cannot get installation XML, step 2"); + set_error("Cannot get installation XML, step 2" TSRMLS_CC); virDomainFree(domain); RETURN_FALSE; } domain2 = virDomainDefineXML(conn->conn, tmp); if (domain2 == NULL) { - set_error_if_unset("Cannot define domain from the XML description"); + set_error_if_unset("Cannot define domain from the XML description" TSRMLS_CC); DPRINTF("%s: Cannot define domain from the XML description (name = '%s', uuid = '%s', error = '%s')\n", PHPFUNC, name, uuid, LIBVIRT_G(last_error)); RETURN_FALSE; } @@ -3492,7 +3494,7 @@ PHP_FUNCTION(libvirt_domain_new) res_domain->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -3539,7 +3541,7 @@ PHP_FUNCTION(libvirt_domain_get_xml_desc) xml=virDomainGetXMLDesc(domain->domain,flags); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } @@ -3573,7 +3575,7 @@ PHP_FUNCTION(libvirt_domain_get_disk_devices) xml=virDomainGetXMLDesc(domain->domain, 0); if (xml == NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } @@ -3608,7 +3610,7 @@ PHP_FUNCTION(libvirt_domain_get_interface_devices) xml=virDomainGetXMLDesc(domain->domain, 0); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } @@ -3653,7 +3655,7 @@ PHP_FUNCTION(libvirt_domain_change_vcpus) xml=virDomainGetXMLDesc(domain->domain,xflags); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } @@ -3677,7 +3679,7 @@ PHP_FUNCTION(libvirt_domain_change_vcpus) DPRINTF("%s: Cannot free domain %p, error code = %d (%s)\n", PHPFUNC, domain->domain, retval, LIBVIRT_G(last_error)); } else { - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0 TSRMLS_CC); DPRINTF("%s: Domain %p freed\n", PHPFUNC, domain->domain); } @@ -3694,7 +3696,7 @@ PHP_FUNCTION(libvirt_domain_change_vcpus) res_domain->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -3741,7 +3743,7 @@ PHP_FUNCTION(libvirt_domain_change_memory) xml=virDomainGetXMLDesc(domain->domain,xflags); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } @@ -3768,7 +3770,7 @@ PHP_FUNCTION(libvirt_domain_change_memory) DPRINTF("%s: Cannot free domain %p, error code = %d (%s)\n", PHPFUNC, domain->domain, retval, LIBVIRT_G(last_error)); } else { - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0 TSRMLS_CC); DPRINTF("%s: Domain %p freed\n", PHPFUNC, domain->domain); } @@ -3785,7 +3787,7 @@ PHP_FUNCTION(libvirt_domain_change_memory) res_domain->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -3825,7 +3827,7 @@ PHP_FUNCTION(libvirt_domain_change_boot_devices) xml=virDomainGetXMLDesc(domain->domain,xflags); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } @@ -3858,7 +3860,7 @@ PHP_FUNCTION(libvirt_domain_change_boot_devices) DPRINTF("%s: Cannot free domain %p, error code = %d (%s)\n", PHPFUNC, domain->domain, retval, LIBVIRT_G(last_error)); } else { - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0 TSRMLS_CC); DPRINTF("%s: Domain %p freed\n", PHPFUNC, domain->domain); } @@ -3875,7 +3877,7 @@ PHP_FUNCTION(libvirt_domain_change_boot_devices) res_domain->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -3923,7 +3925,7 @@ PHP_FUNCTION(libvirt_domain_disk_add) xml=virDomainGetXMLDesc(domain->domain,xflags); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } @@ -3932,7 +3934,7 @@ PHP_FUNCTION(libvirt_domain_disk_add) if (tmp1 != NULL) { free(tmp1); snprintf(new, sizeof(new), "Domain already has image %s connected", img); - set_error(new); + set_error(new TSRMLS_CC); RETURN_FALSE; } @@ -3941,13 +3943,13 @@ PHP_FUNCTION(libvirt_domain_disk_add) if (tmp1 != NULL) { free(tmp1); snprintf(new, sizeof(new), "Domain already has device %s connected", dev); - set_error(new); + set_error(new TSRMLS_CC); RETURN_FALSE; } if (access(img, R_OK) != 0) { snprintf(new, sizeof(new), "Image file %s doesn't exist", img); - set_error(new); + set_error(new TSRMLS_CC); RETURN_FALSE; } @@ -3978,7 +3980,7 @@ PHP_FUNCTION(libvirt_domain_disk_add) DPRINTF("%s: Cannot free domain %p, error code = %d (%s)\n", PHPFUNC, domain->domain, retval, LIBVIRT_G(last_error)); } else { - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0 TSRMLS_CC); DPRINTF("%s: Domain %p freed\n", PHPFUNC, domain->domain); } @@ -3995,7 +3997,7 @@ PHP_FUNCTION(libvirt_domain_disk_add) res_domain->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -4034,7 +4036,7 @@ PHP_FUNCTION(libvirt_domain_disk_remove) xml=virDomainGetXMLDesc(domain->domain,xflags); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } @@ -4042,7 +4044,7 @@ PHP_FUNCTION(libvirt_domain_disk_remove) tmp1 = get_string_from_xpath(xml, new, NULL, &retval); if (tmp1 == NULL) { snprintf(new, sizeof(new), "Device %s is not connected to the guest", dev); - set_error(new); + set_error(new TSRMLS_CC); RETURN_FALSE; } @@ -4088,7 +4090,7 @@ PHP_FUNCTION(libvirt_domain_disk_remove) DPRINTF("%s: Cannot free domain %p, error code = %d (%s)\n", PHPFUNC, domain->domain, retval, LIBVIRT_G(last_error)); } else { - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0 TSRMLS_CC); DPRINTF("%s: Domain %p freed\n", PHPFUNC, domain->domain); } @@ -4100,7 +4102,7 @@ PHP_FUNCTION(libvirt_domain_disk_remove) res_domain->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -4149,7 +4151,7 @@ PHP_FUNCTION(libvirt_domain_nic_add) xml=virDomainGetXMLDesc(domain->domain,xflags); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } @@ -4158,7 +4160,7 @@ PHP_FUNCTION(libvirt_domain_nic_add) if (tmp1 != NULL) { free(tmp1); snprintf(new, sizeof(new), "Domain already has NIC device with MAC address %s connected", mac); - set_error(new); + set_error(new TSRMLS_CC); RETURN_FALSE; } @@ -4166,7 +4168,7 @@ PHP_FUNCTION(libvirt_domain_nic_add) if (slot < 0) { free(tmp1); snprintf(new, sizeof(new), "Cannot find a free function slot for domain"); - set_error(new); + set_error(new TSRMLS_CC); RETURN_FALSE; } @@ -4206,7 +4208,7 @@ PHP_FUNCTION(libvirt_domain_nic_add) DPRINTF("%s: Cannot free domain %p, error code = %d (%s)\n", PHPFUNC, domain->domain, retval, LIBVIRT_G(last_error)); } else { - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0 TSRMLS_CC); DPRINTF("%s: Domain %p freed\n", PHPFUNC, domain->domain); } @@ -4222,7 +4224,7 @@ PHP_FUNCTION(libvirt_domain_nic_add) res_domain->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -4261,7 +4263,7 @@ PHP_FUNCTION(libvirt_domain_nic_remove) xml=virDomainGetXMLDesc(domain->domain,xflags); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } @@ -4269,7 +4271,7 @@ PHP_FUNCTION(libvirt_domain_nic_remove) tmp1 = get_string_from_xpath(xml, new, NULL, &retval); if (tmp1 == NULL) { snprintf(new, sizeof(new), "Network card with IP address %s is not connected to the guest", mac); - set_error(new); + set_error(new TSRMLS_CC); RETURN_FALSE; } @@ -4318,7 +4320,7 @@ PHP_FUNCTION(libvirt_domain_nic_remove) DPRINTF("%s: Cannot free domain %p, error code = %d (%s)\n", PHPFUNC, domain->domain, retval, LIBVIRT_G(last_error)); } else { - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0 TSRMLS_CC); DPRINTF("%s: Domain %p freed\n", PHPFUNC, domain->domain); } @@ -4330,7 +4332,7 @@ PHP_FUNCTION(libvirt_domain_nic_remove) res_domain->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -4561,7 +4563,7 @@ PHP_FUNCTION(libvirt_domain_define_xml) res_domain->conn=conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -4594,7 +4596,7 @@ PHP_FUNCTION(libvirt_domain_create_xml) res_domain->conn=conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -5045,7 +5047,7 @@ PHP_FUNCTION(libvirt_domain_migrate) res_domain->conn=dconn; DPRINTF("%s: returning %p\n", PHPFUNC, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, dconn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, dconn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); } @@ -5142,7 +5144,7 @@ PHP_FUNCTION(libvirt_domain_snapshot_lookup_by_name) res_snapshot->snapshot = snapshot; DPRINTF("%s: returning %p\n", PHPFUNC, res_snapshot->snapshot); - resource_change_counter(INT_RESOURCE_SNAPSHOT, domain->conn->conn, res_snapshot->snapshot, 1); + resource_change_counter(INT_RESOURCE_SNAPSHOT, domain->conn->conn, res_snapshot->snapshot, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_snapshot, le_libvirt_snapshot); } @@ -5171,7 +5173,7 @@ PHP_FUNCTION(libvirt_domain_snapshot_create) res_snapshot->snapshot = snapshot; DPRINTF("%s: returning %p\n", PHPFUNC, res_snapshot->snapshot); - resource_change_counter(INT_RESOURCE_SNAPSHOT, domain->conn->conn, res_snapshot->snapshot, 1); + resource_change_counter(INT_RESOURCE_SNAPSHOT, domain->conn->conn, res_snapshot->snapshot, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_snapshot, le_libvirt_snapshot); } @@ -5350,7 +5352,7 @@ PHP_FUNCTION(libvirt_storagepool_lookup_by_name) res_pool->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_pool->pool); - resource_change_counter(INT_RESOURCE_STORAGEPOOL, conn->conn, res_pool->pool, 1); + resource_change_counter(INT_RESOURCE_STORAGEPOOL, conn->conn, res_pool->pool, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_pool, le_libvirt_storagepool); } @@ -5382,7 +5384,7 @@ PHP_FUNCTION(libvirt_storagepool_lookup_by_volume) res_pool->conn = volume->conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_pool->pool); - resource_change_counter(INT_RESOURCE_STORAGEPOOL, res_pool->conn->conn, res_pool->pool, 1); + resource_change_counter(INT_RESOURCE_STORAGEPOOL, res_pool->conn->conn, res_pool->pool, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_pool, le_libvirt_storagepool); } @@ -5481,7 +5483,7 @@ PHP_FUNCTION(libvirt_storagevolume_lookup_by_name) res_volume->conn = pool->conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_volume->volume); - resource_change_counter(INT_RESOURCE_VOLUME, pool->conn->conn, res_volume->volume, 1); + resource_change_counter(INT_RESOURCE_VOLUME, pool->conn->conn, res_volume->volume, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_volume, le_libvirt_volume); } @@ -5509,7 +5511,7 @@ PHP_FUNCTION(libvirt_storagevolume_lookup_by_path) DPRINTF("%s: virStorageVolLookupByPath(%p, %s) returned %p\n", PHPFUNC, conn->conn, name, volume); if (volume==NULL) { - set_error_if_unset("Cannot find storage volume on requested path"); + set_error_if_unset("Cannot find storage volume on requested path" TSRMLS_CC); RETURN_FALSE; } @@ -5518,7 +5520,7 @@ PHP_FUNCTION(libvirt_storagevolume_lookup_by_path) res_volume->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_volume->volume); - resource_change_counter(INT_RESOURCE_VOLUME, conn->conn, res_volume->volume, 1); + resource_change_counter(INT_RESOURCE_VOLUME, conn->conn, res_volume->volume, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_volume, le_libvirt_volume); } @@ -5621,7 +5623,7 @@ PHP_FUNCTION(libvirt_storagevolume_get_xml_desc) xml=virStorageVolGetXMLDesc(volume->volume,flags); if (xml==NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } @@ -5663,7 +5665,7 @@ PHP_FUNCTION(libvirt_storagevolume_create_xml) res_volume->conn = pool->conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_volume->volume); - resource_change_counter(INT_RESOURCE_VOLUME, pool->conn->conn, res_volume->volume, 1); + resource_change_counter(INT_RESOURCE_VOLUME, pool->conn->conn, res_volume->volume, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_volume, le_libvirt_volume); } @@ -5691,7 +5693,7 @@ PHP_FUNCTION(libvirt_storagevolume_create_xml_from) if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, "rsr", &zpool, &xml, &xml_len, &zvolume) == FAILURE) { - set_error("Invalid pool resource, XML or volume resouce"); + set_error("Invalid pool resource, XML or volume resouce" TSRMLS_CC); RETURN_FALSE; } @@ -5699,7 +5701,7 @@ PHP_FUNCTION(libvirt_storagevolume_create_xml_from) if ((pool==NULL)||(pool->pool==NULL))RETURN_FALSE; ZEND_FETCH_RESOURCE (pl_volume, php_libvirt_volume*, &zvolume, -1, PHP_LIBVIRT_VOLUME_RES_NAME, le_libvirt_volume); if ((pl_volume==NULL)||(pl_volume->volume==NULL))RETURN_FALSE; - resource_change_counter(INT_RESOURCE_VOLUME, NULL, pl_volume->volume, 1); + resource_change_counter(INT_RESOURCE_VOLUME, NULL, pl_volume->volume, 1 TSRMLS_CC); volume=virStorageVolCreateXMLFrom(pool->pool,xml, pl_volume->volume, 0); DPRINTF("%s: virStorageVolCreateXMLFrom(%p, <xml>, %p, 0) returned %p\n", PHPFUNC, pool->pool, pl_volume->volume, volume); @@ -5710,7 +5712,7 @@ PHP_FUNCTION(libvirt_storagevolume_create_xml_from) res_volume->conn = pool->conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_volume->volume); - resource_change_counter(INT_RESOURCE_VOLUME, pool->conn->conn, res_volume->volume, 1); + resource_change_counter(INT_RESOURCE_VOLUME, pool->conn->conn, res_volume->volume, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_volume, le_libvirt_volume); } @@ -5734,7 +5736,7 @@ PHP_FUNCTION(libvirt_storagevolume_delete) retval = virStorageVolDelete(volume->volume, flags); DPRINTF("%s: virStorageVolDelete(%p, %d) returned %d\n", PHPFUNC, volume->volume, flags, retval); if (retval != 0) { - set_error_if_unset("Cannot delete storage volume"); + set_error_if_unset("Cannot delete storage volume" TSRMLS_CC); RETURN_FALSE; } @@ -5821,7 +5823,7 @@ PHP_FUNCTION(libvirt_storagepool_lookup_by_uuid_string) res_pool->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_pool->pool); - resource_change_counter(INT_RESOURCE_STORAGEPOOL, conn->conn, res_pool->pool, 1); + resource_change_counter(INT_RESOURCE_STORAGEPOOL, conn->conn, res_pool->pool, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE (return_value, res_pool, le_libvirt_storagepool); } @@ -5854,7 +5856,7 @@ PHP_FUNCTION(libvirt_storagepool_get_xml_desc) xml = virStoragePoolGetXMLDesc (pool->pool, flags); if (xml == NULL) { - set_error_if_unset("Cannot get the XML description"); + set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } @@ -5900,7 +5902,7 @@ PHP_FUNCTION(libvirt_storagepool_define_xml) res_pool->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_pool->pool); - resource_change_counter(INT_RESOURCE_STORAGEPOOL, conn->conn, res_pool->pool, 1); + resource_change_counter(INT_RESOURCE_STORAGEPOOL, conn->conn, res_pool->pool, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE (return_value, res_pool, le_libvirt_storagepool); } @@ -6268,7 +6270,7 @@ PHP_FUNCTION(libvirt_list_domains) for (i=0;i<count;i++) { domain=virDomainLookupByID(conn->conn,ids[i]); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 1 TSRMLS_CC); if (domain!=NULL) { name=virDomainGetName(domain); @@ -6285,7 +6287,7 @@ PHP_FUNCTION(libvirt_list_domains) rv, LIBVIRT_G (last_error)); } else { - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 0); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 0 TSRMLS_CC); } domain = NULL; } @@ -6359,7 +6361,7 @@ PHP_FUNCTION(libvirt_list_domain_resources) ALLOC_INIT_ZVAL(zdomain); res_domain->conn=conn; - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(zdomain, res_domain, le_libvirt_domain); add_next_index_zval(return_value, zdomain); } @@ -6386,7 +6388,7 @@ PHP_FUNCTION(libvirt_list_domain_resources) res_domain->conn=conn; ZEND_REGISTER_RESOURCE(zdomain, res_domain, le_libvirt_domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); add_next_index_zval(return_value, zdomain); } free(names[i]); @@ -6465,19 +6467,19 @@ PHP_FUNCTION(libvirt_list_active_domains) domain=virDomainLookupByID(conn->conn,ids[i]); if (domain!=NULL) { - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 1); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 1 TSRMLS_CC); name=virDomainGetName(domain); if (name==NULL) { efree (ids); if (virDomainFree (domain)) - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 0); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 0 TSRMLS_CC); RETURN_FALSE; } add_next_index_string(return_value, name, 1); if (virDomainFree (domain)) - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 0); + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 0 TSRMLS_CC); } } efree(ids); @@ -6653,7 +6655,7 @@ PHP_FUNCTION(libvirt_nodedev_get) res_dev->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_dev->device); - resource_change_counter(INT_RESOURCE_NODEDEV, conn->conn, res_dev->device, 1); + resource_change_counter(INT_RESOURCE_NODEDEV, conn->conn, res_dev->device, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_dev, le_libvirt_nodedev); } @@ -6882,7 +6884,7 @@ PHP_FUNCTION(libvirt_network_define_xml) GET_CONNECTION_FROM_ARGS("rs",&zconn,&xml,&xml_len); if ((net = virNetworkDefineXML(conn->conn, xml)) == NULL) { - set_error_if_unset("Cannot define a new network"); + set_error_if_unset("Cannot define a new network" TSRMLS_CC); RETURN_FALSE; } @@ -6891,7 +6893,7 @@ PHP_FUNCTION(libvirt_network_define_xml) res_net->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_net->network); - resource_change_counter(INT_RESOURCE_NETWORK, conn->conn, res_net->network, 1); + resource_change_counter(INT_RESOURCE_NETWORK, conn->conn, res_net->network, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_net, le_libvirt_network); } @@ -6944,7 +6946,7 @@ PHP_FUNCTION(libvirt_network_get) res_net->conn = conn; DPRINTF("%s: returning %p\n", PHPFUNC, res_net->network); - resource_change_counter(INT_RESOURCE_NETWORK, conn->conn, res_net->network, 1); + resource_change_counter(INT_RESOURCE_NETWORK, conn->conn, res_net->network, 1 TSRMLS_CC); ZEND_REGISTER_RESOURCE(return_value, res_net, le_libvirt_network); } @@ -7194,7 +7196,7 @@ PHP_FUNCTION(libvirt_version) int type_len; char *type=NULL; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &type,&type_len) == FAILURE) { - set_error("Invalid arguments"); + set_error("Invalid arguments" TSRMLS_CC); RETURN_FALSE; } @@ -7241,7 +7243,7 @@ PHP_FUNCTION(libvirt_check_version) int major = -1, minor = -1, micro = -1, type = VIR_VERSION_BINDING; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lll|l", &major, &minor, &micro, &type) == FAILURE) { - set_error("Invalid arguments"); + set_error("Invalid arguments" TSRMLS_CC); RETURN_FALSE; } @@ -7288,7 +7290,7 @@ PHP_FUNCTION(libvirt_has_feature) int ret = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) { - set_error("Invalid argument"); + set_error("Invalid argument" TSRMLS_CC); RETURN_FALSE; } @@ -7318,7 +7320,7 @@ PHP_FUNCTION(libvirt_get_iso_images) int num = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &path, &path_len) == FAILURE) { - set_error("Invalid argument"); + set_error("Invalid argument" TSRMLS_CC); RETURN_FALSE; } @@ -7326,7 +7328,7 @@ PHP_FUNCTION(libvirt_get_iso_images) path = strdup( LIBVIRT_G(iso_path_ini) ); if ((path == NULL) || (path[0] != '/')) { - set_error("Invalid argument, path must be set and absolute (start by slash character [/])"); + set_error("Invalid argument, path must be set and absolute (start by slash character [/])" TSRMLS_CC); RETURN_FALSE; } @@ -7398,19 +7400,19 @@ PHP_FUNCTION(libvirt_logfile_set) int err; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &filename, &filename_len, &maxsize) == FAILURE) { - set_error("Invalid argument"); + set_error("Invalid argument" TSRMLS_CC); RETURN_FALSE; } if ((filename == NULL) || (strcasecmp(filename, "null") == 0)) - err = set_logfile(NULL, 0); + err = set_logfile(NULL, 0 TSRMLS_CC); else - err = set_logfile(filename, maxsize); + err = set_logfile(filename, maxsize TSRMLS_CC); if (err < 0) { char tmp[1024] = { 0 }; snprintf(tmp, sizeof(tmp), "Cannot set the log file to %s, error code = %d (%s)", filename, err, strerror(-err)); - set_error(tmp); + set_error(tmp TSRMLS_CC); RETURN_FALSE; } diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 3c7f254..fe7b518 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -238,7 +238,7 @@ int vnc_refresh_screen(char *server, char *port, int scancode); int vnc_send_keys(char *server, char *port, unsigned char *keys); int vnc_send_pointer_event(char *server, char *port, int pos_x, int pos_y, int clicked, int release); -int set_logfile(char *filename, long maxsize); +int set_logfile(char *filename, long maxsize TSRMLS_DC); char *get_datetime(void); #ifdef DEBUG_SUPPORT int gdebug; -- 1.7.8.5

1 1

[libvirt] [PATCH] Add some missing hook functions
by Daniel P. Berrange 10 Jun '12

10 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> A core use case of the hook scripts is to be able to do things to a guest's network configuration. It is possible to hook into the 'start' operation for a QEMU guest which runs just before the guest is started. The TAP devices will exist at this point, but the QEMU process will not. It can be desirable to have a 'started' hook too, which runs once QEMU has started. If libvirtd is restarted it will re-populate firewall rules, but there is no QEMU hook to trigger for existing domains. This is solved with a 'reconnect' hook. Finally, if attaching to an external QEMU process there needs to be an 'attach' hook script. This all also applies to the LXC driver * docs/hooks.html.in: Document new operations * src/util/hooks.c, src/util/hooks.c: Add 'started', 'reconnect' and 'attach' operations for QEMU. Add 'prepare', 'started', 'release' and 'reconnect' operations for LXC * src/lxc/lxc_driver.c: Add hooks for 'prepare', 'started', 'release' and 'reconnect' operations * src/qemu/qemu_process.c: Add hooks for 'started', 'reconnect' and 'reconnect' operations --- docs/hooks.html.in | 52 +++++++++++++++++++++++--- src/lxc/lxc_driver.c | 94 ++++++++++++++++++++++++++++++++++++++--------- src/qemu/qemu_process.c | 51 +++++++++++++++++++++++++ src/util/hooks.c | 11 +++++- src/util/hooks.h | 7 ++++ 5 files changed, 190 insertions(+), 25 deletions(-) diff --git a/docs/hooks.html.in b/docs/hooks.html.in index ab16db2..2d64d42 100644 --- a/docs/hooks.html.in +++ b/docs/hooks.html.in @@ -101,7 +101,7 @@ <h5><a name="qemu">/etc/libvirt/hooks/qemu</a></h5> <ul> <li>Before a QEMU guest is started, the qemu hook script is - called in two locations; if either location fails, the guest + called in three locations; if either location fails, the guest is not started. The first location, since 0.9.0, is before libvirt performs any resource labeling, and the hook can allocate resources not managed by @@ -110,7 +110,11 @@ The second location, available Since 0.8.0, occurs after libvirt has finished labeling all resources, but has not yet started the guest, called as: - <pre>/etc/libvirt/hooks/qemu guest_name start begin -</pre></li> + <pre>/etc/libvirt/hooks/qemu guest_name start begin -</pre> + The third location, 0.9.13, + occurs after the QEMU process has successfully started up: + <pre>/etc/libvirt/hooks/qemu guest_name started begin -</pre> + </li> <li>When a QEMU guest is stopped, the qemu hook script is called in two locations, to match the startup. First, since 0.8.0, the hook is @@ -130,15 +134,51 @@ script returns failure or the output XML is not valid, incoming migration will be canceled. This hook may be used, e.g., to change location of disk images for incoming domains.</li> + <li>Since 0.9.13, the qemu hook script + is also called when the libvirtd daemon restarts and reconnects + to previously running QEMU processes. If the script fails, the + existing QEMU process will be killed off. It is called as: + <pre>/etc/libvirt/hooks/qemu guest_name reconnect begin -</pre> + </li> + <li>Since 0.9.13, the qemu hook script + is also called when the QEMU driver is told to attach to an + externally launched QEMU process. It is called as: + <pre>/etc/libvirt/hooks/qemu guest_name attach begin -</pre> + </li> </ul> <h5><a name="lxc">/etc/libvirt/hooks/lxc</a></h5> <ul> - <li>When an LXC guest is started, the lxc hook script is called as: - <pre>/etc/libvirt/hooks/lxc guest_name start begin -</pre></li> + <li>Before a LXC guest is started, the lxc hook script is + called in three locations; if either location fails, the guest + is not started. The first location, since + 0.9.13, is before libvirt performs any resource + labeling, and the hook can allocate resources not managed by + libvirt such as DRBD or missing bridges. This is called as: + <pre>/etc/libvirt/hooks/lxc guest_name prepare begin -</pre> + The second location, available Since + 0.8.0, occurs after libvirt has finished labeling + all resources, but has not yet started the guest, called as: + <pre>/etc/libvirt/hooks/lxc guest_name start begin -</pre> + The third location, 0.9.13, + occurs after the LXC process has successfully started up: + <pre>/etc/libvirt/hooks/lxc guest_name started begin -</pre> + </li> <li>When a LXC guest is stopped, the lxc hook script is called - as: - <pre>/etc/libvirt/hooks/lxc guest_name stopped end -</pre></li> + in two locations, to match the startup. + First, since 0.8.0, the hook is + called before libvirt restores any labels: + <pre>/etc/libvirt/hooks/lxc guest_name stopped end -</pre> + Then, after libvirt has released all resources, the hook is + called again, since 0.9.0, to allow + any additional resource cleanup: + <pre>/etc/libvirt/hooks/lxc guest_name release end -</pre></li> + <li>Since 0.9.13, the lxc hook script + is also called when the libvirtd daemon restarts and reconnects + to previously running LXC processes. If the script fails, the + existing LXC process will be killed off. It is called as: + <pre>/etc/libvirt/hooks/lxc guest_name reconnect begin -</pre> + </li> </ul> diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9aea556..0669c17 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1152,6 +1152,17 @@ static void lxcVmCleanup(lxc_driver_t *driver, virCgroupFree(&cgroup); } + /* now that we know it's stopped call the hook if present */ + if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { + char *xml = virDomainDefFormat(vm->def, 0); + + /* we can't stop the operation even if the script raised an error */ + virHookCall(VIR_HOOK_DRIVER_LXC, vm->def->name, + VIR_HOOK_LXC_OP_RELEASE, VIR_HOOK_SUBOP_END, + NULL, xml, NULL); + VIR_FREE(xml); + } + if (vm->newDef) { virDomainDefFree(vm->def); vm->def = vm->newDef; @@ -1625,23 +1636,6 @@ lxcBuildControllerCmd(lxc_driver_t *driver, virCommandAddArgList(cmd, "--veth", veths[i], NULL); } - /* now that we know it is about to start call the hook if present */ - if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { - char *xml = virDomainDefFormat(vm->def, 0); - int hookret; - - hookret = virHookCall(VIR_HOOK_DRIVER_LXC, vm->def->name, - VIR_HOOK_LXC_OP_START, VIR_HOOK_SUBOP_BEGIN, - NULL, xml, NULL); - VIR_FREE(xml); - - /* - * If the script raised an error abort the launch - */ - if (hookret < 0) - goto cleanup; - } - virCommandPreserveFD(cmd, handshakefd); return cmd; @@ -1803,6 +1797,23 @@ static int lxcVmStart(virConnectPtr conn, if (virDomainObjSetDefTransient(driver->caps, vm, true) < 0) goto cleanup; + /* Run an early hook to set-up missing devices */ + if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { + char *xml = virDomainDefFormat(vm->def, 0); + int hookret; + + hookret = virHookCall(VIR_HOOK_DRIVER_LXC, vm->def->name, + VIR_HOOK_LXC_OP_PREPARE, VIR_HOOK_SUBOP_BEGIN, + NULL, xml, NULL); + VIR_FREE(xml); + + /* + * If the script raised an error abort the launch + */ + if (hookret < 0) + goto cleanup; + } + /* Here we open all the PTYs we need on the host OS side. * The LXC controller will open the guest OS side PTYs * and forward I/O between them. @@ -1887,6 +1898,23 @@ static int lxcVmStart(virConnectPtr conn, virCommandSetOutputFD(cmd, &logfd); virCommandSetErrorFD(cmd, &logfd); + /* now that we know it is about to start call the hook if present */ + if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { + char *xml = virDomainDefFormat(vm->def, 0); + int hookret; + + hookret = virHookCall(VIR_HOOK_DRIVER_LXC, vm->def->name, + VIR_HOOK_LXC_OP_START, VIR_HOOK_SUBOP_BEGIN, + NULL, xml, NULL); + VIR_FREE(xml); + + /* + * If the script raised an error abort the launch + */ + if (hookret < 0) + goto cleanup; + } + /* Log timestamp */ if ((timestamp = virTimeStringNow()) == NULL) { virReportOOMError(); @@ -1965,6 +1993,23 @@ static int lxcVmStart(virConnectPtr conn, if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) goto error; + /* finally we can call the 'started' hook script if any */ + if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { + char *xml = virDomainDefFormat(vm->def, 0); + int hookret; + + hookret = virHookCall(VIR_HOOK_DRIVER_LXC, vm->def->name, + VIR_HOOK_LXC_OP_STARTED, VIR_HOOK_SUBOP_BEGIN, + NULL, xml, NULL); + VIR_FREE(xml); + + /* + * If the script raised an error abort the launch + */ + if (hookret < 0) + goto error; + } + rc = 0; cleanup: @@ -2512,6 +2557,21 @@ lxcReconnectVM(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) if (virSecurityManagerReserveLabel(driver->securityManager, vm->def, vm->pid) < 0) goto error; + + /* now that we know it's reconnected call the hook if present */ + if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { + char *xml = virDomainDefFormat(vm->def, 0); + int hookret; + + /* we can't stop the operation even if the script raised an error */ + hookret = virHookCall(VIR_HOOK_DRIVER_LXC, vm->def->name, + VIR_HOOK_LXC_OP_RECONNECT, VIR_HOOK_SUBOP_BEGIN, + NULL, xml, NULL); + VIR_FREE(xml); + if (hookret < 0) + goto error; + } + } else { vm->def->id = -1; VIR_FORCE_CLOSE(priv->monitor); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 58ba5bf..b79944f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3108,6 +3108,23 @@ qemuProcessReconnect(void *opaque) if (virDomainSaveStatus(driver->caps, driver->stateDir, obj) < 0) goto error; + /* Run an hook to allow admins to do some magic */ + if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { + char *xml = qemuDomainDefFormatXML(driver, obj->def, 0, false); + int hookret; + + hookret = virHookCall(VIR_HOOK_DRIVER_QEMU, obj->def->name, + VIR_HOOK_QEMU_OP_RECONNECT, VIR_HOOK_SUBOP_BEGIN, + NULL, xml, NULL); + VIR_FREE(xml); + + /* + * If the script raised an error abort the launch + */ + if (hookret < 0) + goto error; + } + if (obj->def->id >= driver->nextvmid) driver->nextvmid = obj->def->id + 1; @@ -3747,6 +3764,23 @@ int qemuProcessStart(virConnectPtr conn, if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) goto cleanup; + /* finally we can call the 'started' hook script if any */ + if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { + char *xml = qemuDomainDefFormatXML(driver, vm->def, 0, false); + int hookret; + + hookret = virHookCall(VIR_HOOK_DRIVER_QEMU, vm->def->name, + VIR_HOOK_QEMU_OP_STARTED, VIR_HOOK_SUBOP_BEGIN, + NULL, xml, NULL); + VIR_FREE(xml); + + /* + * If the script raised an error abort the launch + */ + if (hookret < 0) + goto cleanup; + } + virCommandFree(cmd); VIR_FORCE_CLOSE(logfile); @@ -4255,6 +4289,23 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) goto cleanup; + /* Run an hook to allow admins to do some magic */ + if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { + char *xml = qemuDomainDefFormatXML(driver, vm->def, 0, false); + int hookret; + + hookret = virHookCall(VIR_HOOK_DRIVER_QEMU, vm->def->name, + VIR_HOOK_QEMU_OP_ATTACH, VIR_HOOK_SUBOP_BEGIN, + NULL, xml, NULL); + VIR_FREE(xml); + + /* + * If the script raised an error abort the launch + */ + if (hookret < 0) + goto cleanup; + } + VIR_FORCE_CLOSE(logfile); VIR_FREE(seclabel); diff --git a/src/util/hooks.c b/src/util/hooks.c index ce60b43..f89a40f 100644 --- a/src/util/hooks.c +++ b/src/util/hooks.c @@ -74,11 +74,18 @@ VIR_ENUM_IMPL(virHookQemuOp, VIR_HOOK_QEMU_OP_LAST, "stopped", "prepare", "release", - "migrate") + "migrate", + "started", + "reconnect", + "attach") VIR_ENUM_IMPL(virHookLxcOp, VIR_HOOK_LXC_OP_LAST, "start", - "stopped") + "stopped", + "prepare", + "release", + "started", + "reconnect") static int virHooksFound = -1; diff --git a/src/util/hooks.h b/src/util/hooks.h index 7fd29f6..1af7c04 100644 --- a/src/util/hooks.h +++ b/src/util/hooks.h @@ -57,6 +57,9 @@ enum virHookQemuOpType { VIR_HOOK_QEMU_OP_PREPARE, /* domain startup initiated */ VIR_HOOK_QEMU_OP_RELEASE, /* domain destruction is over */ VIR_HOOK_QEMU_OP_MIGRATE, /* domain is being migrated */ + VIR_HOOK_QEMU_OP_STARTED, /* domain has started */ + VIR_HOOK_QEMU_OP_RECONNECT, /* domain is being reconnected by libvirt */ + VIR_HOOK_QEMU_OP_ATTACH, /* domain is being attached to be libvirt */ VIR_HOOK_QEMU_OP_LAST, }; @@ -64,6 +67,10 @@ enum virHookQemuOpType { enum virHookLxcOpType { VIR_HOOK_LXC_OP_START, /* domain is about to start */ VIR_HOOK_LXC_OP_STOPPED, /* domain has stopped */ + VIR_HOOK_LXC_OP_PREPARE, /* domain startup initiated */ + VIR_HOOK_LXC_OP_RELEASE, /* domain destruction is over */ + VIR_HOOK_LXC_OP_STARTED, /* domain has started */ + VIR_HOOK_LXC_OP_RECONNECT, /* domain is being reconnected by libvirt */ VIR_HOOK_LXC_OP_LAST, }; -- 1.7.10.1

3 2

[libvirt] [PATCH V14 0/5] Add DHCP snooping support to nwfilter
by Stefan Berger 10 Jun '12

10 Jun '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='CTRL_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='CTRL_IP_LEARNING' value='dhcp'/> <parameter name='IP_LEASE' value='192.168.122.210,180'/> </filterref> </interface> Regards, David and Stefan v14: - addressed Eric Blake's concerns - introducing a typedef for MAC addresses

3 17

[libvirt] [PATCHv2 0/9] API to list all domains
by Peter Krempa 10 Jun '12

10 Jun '12

Second version of the atomic listing API. This version includes fixes and enhancements after Eric's review: - Enhanced documentation - NULL element at the end of the list - filtering flags and filter support - helper function to ease implementation across drivers - implementation to most of the drivers - enhancement of the virsh helper that now supports filter simulation For some of the drivers I don't have means to test the implementation apart from compiling it. Please beaware of those. Peter Krempa (9): lib: Add public api to enable atomic listing of guest python: add API exports for virConnectListAllDomains() remote: implement remote protocol for virConnectListAllDomains() conf: Add helper for listing domains on drivers supporting virDomainObj drivers: Implement virListAllDomains for drivers using virDomainObj vbox: Add support for virDomainList hyperv: Add implementation for virConnectListAllDomains() esx: Add implementation for virConnectListAllDomains() virsh: add support for virConnectListAllDomains and clean up cmdList daemon/remote.c | 52 ++++ include/libvirt/libvirt.h.in | 36 +++- python/generator.py | 1 + python/libvirt-override-api.xml | 12 +- python/libvirt-override-virConnect.py | 12 + python/libvirt-override.c | 47 ++++- src/Makefile.am | 6 +- src/conf/virdomainlist.c | 214 +++++++++++++++ src/conf/virdomainlist.h | 36 +++ src/driver.h | 11 +- src/esx/esx_driver.c | 108 ++++++++ src/hyperv/hyperv_driver.c | 95 +++++++ src/libvirt.c | 122 +++++++++- src/libvirt_private.syms | 5 + src/libvirt_public.syms | 5 + src/libxl/libxl_driver.c | 33 +++ src/lxc/lxc_driver.c | 32 +++ src/openvz/openvz_driver.c | 30 ++ src/qemu/qemu_driver.c | 87 ++++++- src/remote/remote_driver.c | 63 +++++ src/remote/remote_protocol.x | 14 +- src/remote_protocol-structs | 12 + src/test/test_driver.c | 31 +++ src/uml/uml_driver.c | 31 +++ src/vbox/vbox_tmpl.c | 133 ++++++++++ src/vmware/vmware_driver.c | 31 +++ tools/virsh.c | 469 +++++++++++++++++++++------------ 27 files changed, 1536 insertions(+), 192 deletions(-) create mode 100644 src/conf/virdomainlist.c create mode 100644 src/conf/virdomainlist.h -- 1.7.3.4

2 21

[libvirt] Compiling out SSL support - status?
by Chris Van Heuveln 08 Jun '12

08 Jun '12

Hi, I want to remove TLS from libvirt (0.8.4). I ran across this earlier thread on the same topic: http://www.redhat.com/archives/libvir-list/2012-January/msg00479.html ...just curious if any further development occurred in this area since then? ie, support for a --without-gnutls compiler option. Thanks, Chris

2 2

[libvirt] [PATCH] Only check for cluster fs if we're using a filesystem
by Guido Günther 08 Jun '12

08 Jun '12

otherwise migration fails for e.g. network filesystems like sheepdog with: error: Invalid relative path 'virt-name': Invalid argument while we should fail with: Migration may lead to data corruption if disks use cache != none References: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676328 https://www.redhat.com/archives/libvirt-users/2012-May/msg00088.html --- src/qemu/qemu_migration.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b58380b..a1fb962 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -840,10 +840,13 @@ qemuMigrationIsSafe(virDomainDefPtr def) !disk->readonly && disk->cachemode != VIR_DOMAIN_DISK_CACHE_DISABLE) { int cfs; - if ((cfs = virStorageFileIsClusterFS(disk->src)) == 1) - continue; - else if (cfs < 0) - return false; + + if (disk->type == VIR_DOMAIN_DISK_TYPE_FILE) { + if ((cfs = virStorageFileIsClusterFS(disk->src)) == 1) + continue; + else if (cfs < 0) + return false; + } qemuReportError(VIR_ERR_MIGRATE_UNSAFE, "%s", _("Migration may lead to data corruption if disks" -- 1.7.10

2 2

[libvirt] libvirt Application Development Guide - revival
by Scott Radvan 08 Jun '12

08 Jun '12

Hi list, I write virtualization docs for Red Hat and would like to maintain this guide[1] - it's in need of a bit of attention. I have publican and the publican brand up and running, and have already cloned the git repo, but I would appreciate some help on how to get commit access, or any other pertinent info I should be aware of before getting started. Any comments on the guide (ideas for new sections, future trends for libvirt app development, parts that are plain wrong) would be more than welcome! A Red Hat Bugzilla component is set up for this guide: doc-Libvirt_Application_Development_Guide (under the Red Hat Enterprise Linux 6 product). Thanks for your help, [1] http://libvirt.org/devguide.html -- Scott Radvan Content Author II Platform (Virtualization) Red Hat APAC

3 2

[libvirt] [PATCH] snapshot: add virDomainSnapshotRef API
by Eric Blake 08 Jun '12

08 Jun '12

virDomainSnapshotPtr has a refcount member, but no one was able to use it. Furthermore, all of our other vir*Ptr objects have a *Ref method to match their *Free method. Thankfully, this is client-side only, so we can use this new function regardless of how old the server side is! (I have future patches to virsh that want to use it.) * include/libvirt/libvirt.h.in (virDomainSnapshotRef): Declare. * src/libvirt.c (virDomainSnapshotRef): Implement it. * src/libvirt_public.syms (LIBVIRT_0.9.13): Export it. --- include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 33 +++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++++ 3 files changed, 39 insertions(+) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index da3ce29..fcb6695 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3424,6 +3424,7 @@ typedef enum { int virDomainSnapshotDelete(virDomainSnapshotPtr snapshot, unsigned int flags); +int virDomainSnapshotRef(virDomainSnapshotPtr snapshot); int virDomainSnapshotFree(virDomainSnapshotPtr snapshot); /* diff --git a/src/libvirt.c b/src/libvirt.c index 6386ed4..00358d6 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -17487,6 +17487,39 @@ error: } /** + * virDomainSnapshotRef: + * @snapshot: the snapshot to hold a reference on + * + * Increment the reference count on the snapshot. For each + * additional call to this method, there shall be a corresponding + * call to virDomainSnapshotFree to release the reference count, once + * the caller no longer needs the reference to this object. + * + * This method is typically useful for applications where multiple + * threads are using a connection, and it is required that the + * connection and domain remain open until all threads have finished + * using the snapshot. ie, each new thread using a snapshot would + * increment the reference count. + * + * Returns 0 in case of success and -1 in case of failure. + */ +int +virDomainSnapshotRef(virDomainSnapshotPtr snapshot) +{ + if ((!VIR_IS_DOMAIN_SNAPSHOT(snapshot))) { + virLibDomainSnapshotError(VIR_ERR_INVALID_DOMAIN_SNAPSHOT, + __FUNCTION__); + virDispatchError(NULL); + return -1; + } + virMutexLock(&snapshot->domain->conn->lock); + VIR_DEBUG("snapshot=%p, refs=%d", snapshot, snapshot->refs); + snapshot->refs++; + virMutexUnlock(&snapshot->domain->conn->lock); + return 0; +} + +/** * virDomainSnapshotFree: * @snapshot: a domain snapshot object * diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 46c13fb..ba61595 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -534,4 +534,9 @@ LIBVIRT_0.9.11 { virDomainPMWakeup; } LIBVIRT_0.9.10; +LIBVIRT_0.9.13 { + global: + virDomainSnapshotRef; +} LIBVIRT_0.9.11; + # .... define new API here using predicted next version number .... -- 1.7.10.2

2 2

Re: [libvirt] [Qemu-devel] [PATCH v2 0/4] file descriptor passing using passfd
by Corey Bryant 08 Jun '12

08 Jun '12

Please review this patch series if you could. I apologize for sending it more than once. Thanks! -- Regards, Corey On 06/08/2012 11:42 AM, Corey Bryant wrote: > libvirt's sVirt security driver provides SELinux MAC isolation for > Qemu guest processes and their corresponding image files. In other > words, sVirt uses SELinux to prevent a QEMU process from opening > files that do not belong to it. > > sVirt provides this support by labeling guests and resources with > security labels that are stored in file system extended attributes. > Some file systems, such as NFS, do not support the extended > attribute security namespace, and therefore cannot support sVirt > isolation. > > A solution to this problem is to provide fd passing support, where > libvirt opens files and passes file descriptors to QEMU. This, > along with SELinux policy to prevent QEMU from opening files, can > provide image file isolation for NFS files stored on the same NFS > mount. > > This patch series adds the passfd QMP monitor command, which allows > an fd to be passed via SCM_RIGHTS, and returns the received file > descriptor. Support is also added to the block layer to allow QEMU > to dup the fd when the filename is of the /dev/fd/X format. This > is useful if MAC policy prevents QEMU from opening specific types > of files. > > One nice thing about this approach is that no new SELinux policy is > required to prevent open of NFS files (files with type nfs_t). The > virt_use_nfs boolean type simply needs to be set to false, and open > will be prevented (and dup will be allowed). For example: > > # setsebool virt_use_nfs 0 > # getsebool virt_use_nfs > virt_use_nfs --> off > > Corey Bryant (4): > qapi: Convert getfd and closefd > qapi: Add passfd QMP command > osdep: Enable qemu_open to dup pre-opened fd > block: Convert open calls to qemu_open > > block/raw-posix.c | 18 +++++++++--------- > block/raw-win32.c | 4 ++-- > block/vdi.c | 5 +++-- > block/vmdk.c | 21 +++++++++------------ > block/vpc.c | 2 +- > block/vvfat.c | 21 +++++++++++---------- > hmp-commands.hx | 6 ++---- > hmp.c | 18 ++++++++++++++++++ > hmp.h | 2 ++ > monitor.c | 36 ++++++++++++++++++++---------------- > osdep.c | 13 +++++++++++++ > qapi-schema.json | 44 ++++++++++++++++++++++++++++++++++++++++++++ > qmp-commands.hx | 33 +++++++++++++++++++++++++++++---- > 13 files changed, 163 insertions(+), 60 deletions(-) >

1 0

Re: [libvirt] [Qemu-devel] [PATCH v2 0/4] file descriptor passing using passfd
by Corey Bryant 08 Jun '12

08 Jun '12

Please ignore this series as well. Something is amiss. I'll be resending. -- Regards, Corey On 06/08/2012 10:53 AM, Corey Bryant wrote: > libvirt's sVirt security driver provides SELinux MAC isolation for > Qemu guest processes and their corresponding image files. In other > words, sVirt uses SELinux to prevent a QEMU process from opening > files that do not belong to it. > > sVirt provides this support by labeling guests and resources with > security labels that are stored in file system extended attributes. > Some file systems, such as NFS, do not support the extended > attribute security namespace, and therefore cannot support sVirt > isolation. > > A solution to this problem is to provide fd passing support, where > libvirt opens files and passes file descriptors to QEMU. This, > along with SELinux policy to prevent QEMU from opening files, can > provide image file isolation for NFS files stored on the same NFS > mount. > > This patch series adds the passfd QMP monitor command, which allows > an fd to be passed via SCM_RIGHTS, and returns the received file > descriptor. Support is also added to the block layer to allow QEMU > to dup the fd when the filename is of the /dev/fd/X format. This > is useful if MAC policy prevents QEMU from opening specific types > of files. > > One nice thing about this approach is that no new SELinux policy is > required to prevent open of NFS files (files with type nfs_t). The > virt_use_nfs boolean type simply needs to be set to false, and open > will be prevented (and dup will be allowed). For example: > > # setsebool virt_use_nfs 0 > # getsebool virt_use_nfs > virt_use_nfs --> off > > Corey Bryant (4): > qapi: Convert getfd and closefd > qapi: Add passfd QMP command > osdep: Enable qemu_open to dup pre-opened fd > block: Convert open calls to qemu_open > > block/raw-posix.c | 18 +++++++++--------- > block/raw-win32.c | 4 ++-- > block/vdi.c | 5 +++-- > block/vmdk.c | 21 +++++++++------------ > block/vpc.c | 2 +- > block/vvfat.c | 21 +++++++++++---------- > hmp-commands.hx | 6 ++---- > hmp.c | 18 ++++++++++++++++++ > hmp.h | 2 ++ > monitor.c | 36 ++++++++++++++++++++---------------- > osdep.c | 13 +++++++++++++ > qapi-schema.json | 44 ++++++++++++++++++++++++++++++++++++++++++++ > qmp-commands.hx | 33 +++++++++++++++++++++++++++++---- > 13 files changed, 163 insertions(+), 60 deletions(-) > -- Regards, Corey

1 0

Re: [libvirt] [Qemu-devel] [PATCH v2 0/4] file descriptor passing using passfd
by Corey Bryant 08 Jun '12

08 Jun '12

Please ignore this series. Something is amiss. I'll be resending. -- Regards, Corey On 06/08/2012 10:49 AM, Corey Bryant wrote: > libvirt's sVirt security driver provides SELinux MAC isolation for > Qemu guest processes and their corresponding image files. In other > words, sVirt uses SELinux to prevent a QEMU process from opening > files that do not belong to it. > > sVirt provides this support by labeling guests and resources with > security labels that are stored in file system extended attributes. > Some file systems, such as NFS, do not support the extended > attribute security namespace, and therefore cannot support sVirt > isolation. > > A solution to this problem is to provide fd passing support, where > libvirt opens files and passes file descriptors to QEMU. This, > along with SELinux policy to prevent QEMU from opening files, can > provide image file isolation for NFS files stored on the same NFS > mount. > > This patch series adds the passfd QMP monitor command, which allows > an fd to be passed via SCM_RIGHTS, and returns the received file > descriptor. Support is also added to the block layer to allow QEMU > to dup the fd when the filename is of the /dev/fd/X format. This > is useful if MAC policy prevents QEMU from opening specific types > of files. > > One nice thing about this approach is that no new SELinux policy is > required to prevent open of NFS files (files with type nfs_t). The > virt_use_nfs boolean type simply needs to be set to false, and open > will be prevented (and dup will be allowed). For example: > > # setsebool virt_use_nfs 0 > # getsebool virt_use_nfs > virt_use_nfs --> off > > Corey Bryant (4): > qapi: Convert getfd and closefd > qapi: Add passfd QMP command > osdep: Enable qemu_open to dup pre-opened fd > block: Convert open calls to qemu_open > > block/raw-posix.c | 18 +++++++++--------- > block/raw-win32.c | 4 ++-- > block/vdi.c | 5 +++-- > block/vmdk.c | 21 +++++++++------------ > block/vpc.c | 2 +- > block/vvfat.c | 21 +++++++++++---------- > hmp-commands.hx | 6 ++---- > hmp.c | 18 ++++++++++++++++++ > hmp.h | 2 ++ > monitor.c | 36 ++++++++++++++++++++---------------- > osdep.c | 13 +++++++++++++ > qapi-schema.json | 44 ++++++++++++++++++++++++++++++++++++++++++++ > qmp-commands.hx | 33 +++++++++++++++++++++++++++++---- > 13 files changed, 163 insertions(+), 60 deletions(-) > -- Regards, Corey

1 0

[libvirt] pointless time-consuming test 'virsh-all'
by Eric Blake 08 Jun '12

08 Jun '12

The command 'make -C tests check' takes forever, because it is calling this lengthy virsh command and ignoring the failures: $ time tools/virsh -c test:///default connect error: Failed to connect to the hypervisor error: Failed to connect socket to '/run/user/eblake/libvirt/libvirt-sock': No such file or directory real 0m21.070s user 0m0.027s sys 0m0.036s The test looks quite broken - ALL it is currently doing is wasting 21 seconds on this one iteration, because it ignores output and exit status (what else _is_ there, besides effects to the file system)? Any volunteers to clean this test up into something that actually does something useful? -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

5 9

[libvirt] daemon: Install libvirtd under 'bin' not 'sbin'
by Zeeshan Ali (Khattak) 08 Jun '12

08 Jun '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> This binary is not admin-only at all and launching it as normal user is a supported use case: session. --- daemon/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index fbb0ae1..472e523 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -70,7 +70,7 @@ if WITH_LIBVIRTD man8_MANS = libvirtd.8 -sbin_PROGRAMS = libvirtd +bin_PROGRAMS = libvirtd confdir = $(sysconfdir)/libvirt/ conf_DATA = libvirtd.conf -- 1.7.10.2

4 7