- Devel - libvirt List Archives

[libvirt] [PATCH] Make ESX & Hyper-V code generator safe with parallel builds
by Daniel P. Berrange 24 Jul '12

24 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> If from a clean GIT checkout 'make -j 8' is run, the ESX and Hyper-V code will be generated multiple times over. This is because there are multiple files being generated from one invocation of the generator script. make does not realize this and so invokes the generator once per file. This doesn't matter with serialized builds, but with parallel builds multiple instances of the generator get run at once. make[2]: Entering directory `/home/berrange/src/virt/libvirt/src' GEN util/virkeymaps.h GEN remote/remote_protocol.h GEN remote/remote_client_bodies.h GEN remote/qemu_protocol.h GEN remote/qemu_client_bodies.h GEN esx/esx_vi_methods.generated.c GEN esx/esx_vi_methods.generated.h GEN esx/esx_vi_methods.generated.macro GEN esx/esx_vi_types.generated.c GEN esx/esx_vi_types.generated.h GEN esx/esx_vi_types.generated.typedef GEN esx/esx_vi_types.generated.typedef GEN esx/esx_vi_types.generated.typeenum GEN esx/esx_vi_types.generated.typetostring GEN esx/esx_vi_types.generated.typefromstring GEN esx/esx_vi_types.generated.h GEN esx/esx_vi_types.generated.c GEN esx/esx_vi_methods.generated.h GEN esx/esx_vi_methods.generated.c GEN esx/esx_vi_methods.generated.macro GEN esx/esx_vi.generated.h GEN esx/esx_vi.generated.c GEN esx/esx_vi_types.generated.typeenum GEN esx/esx_vi_types.generated.typedef GEN esx/esx_vi_types.generated.typeenum GEN esx/esx_vi_types.generated.typetostring GEN esx/esx_vi_types.generated.typefromstring GEN esx/esx_vi_types.generated.h GEN esx/esx_vi_types.generated.c GEN esx/esx_vi_methods.generated.h ...snip... GEN hyperv/hyperv_wmi.generated.h GEN libvirt_qemu_probes.h GEN locking/qemu-sanlock.conf GEN hyperv/hyperv_wmi.generated.c GEN rpc/virnetprotocol.h GEN hyperv/hyperv_wmi_classes.generated.typedef GEN hyperv/hyperv_wmi_classes.generated.h GEN hyperv/hyperv_wmi_classes.generated.c GEN rpc/virkeepaliveprotocol.h GEN remote/remote_protocol.c GEN remote/qemu_protocol.c GEN rpc/virkeepaliveprotocol.c GEN rpc/virnetprotocol.c GEN libvirt.def Prevent this using a timestamp file to control generation, as was previously done for the python bindings in commit a7868e0131516ef2dece82586edd52dc87fe336c Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gitignore | 1 + src/Makefile.am | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 46dbcdf..b4cbb5f 100644 --- a/.gitignore +++ b/.gitignore @@ -93,6 +93,7 @@ /python/libvirt.py /python/libvirt_qemu.py /sc_* +/src/.*.stamp /src/esx/*.generated.* /src/hyperv/*.generated.* /src/libvirt*.def diff --git a/src/Makefile.am b/src/Makefile.am index a9f8d94..93fcf3b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -874,9 +874,17 @@ endif BUILT_SOURCES += $(ESX_DRIVER_GENERATED) -$(ESX_DRIVER_GENERATED): $(srcdir)/esx/esx_vi_generator.input \ +ESX_GENERATED_STAMP = .esx_vi_generator.stamp + +$(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP) + +$(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \ $(srcdir)/esx/esx_vi_generator.py - $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/esx/esx_vi_generator.py + $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/esx/esx_vi_generator.py \ + && touch $@ + +MAINTAINERCLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) + if WITH_ESX noinst_LTLIBRARIES += libvirt_driver_esx.la @@ -892,9 +900,16 @@ endif BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED) -$(HYPERV_DRIVER_GENERATED): $(srcdir)/hyperv/hyperv_wmi_generator.input \ +HYPERV_GENERATED_STAMP = .hyperv_wmi_generator.stamp + +$(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP) + +$(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \ $(srcdir)/hyperv/hyperv_wmi_generator.py - $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/hyperv/hyperv_wmi_generator.py + $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/hyperv/hyperv_wmi_generator.py \ + && touch $@ + +MAINTAINERCLEANFILES += $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP) if WITH_HYPERV noinst_LTLIBRARIES += libvirt_driver_hyperv.la @@ -1675,4 +1690,4 @@ endif CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s DISTCLEANFILES += $(GENERATED_SYM_FILES) -MAINTAINERCLEANFILES += $(REMOTE_DRIVER_GENERATED) $(VIR_NET_RPC_GENERATED) $(ESX_DRIVER_GENERATED) +MAINTAINERCLEANFILES += $(REMOTE_DRIVER_GENERATED) $(VIR_NET_RPC_GENERATED) -- 1.7.10.4

2 1

[libvirt] [PATCH libguestfs 0/4] Add a libvirt backend to libguestfs.
by Richard W.M. Jones 23 Jul '12

23 Jul '12

This preliminary patch series adds a libvirt backend to libguestfs. It's for review only because although it launches the guest OK, there are some missing features that need to be implemented. The meat of the patch is in part 4/4. To save you the trouble of interpreting libxml2 fragments, an example of the generated XML and the corresponding qemu command line are attached below. Note the hack required to work around lack of support for '-drive [...]snapshot=on' Some questions: - I've tried to use the minimum set of XML possible to create the guest, leaving libvirt to fill out as much as possible. How does this XML look? - The <name> is mandatory, and I generate one randomly. Is this a good idea? I notice that my $HOME/.libvirt directory fills up with random files. Really I'd like libvirt to generate a random name and just deal with the logfiles. - How do we query libvirt to find out if qemu supports virtio-scsi? - Will <source file> work if the source is a host device? - Since when has <memory unit> attribute been available? For example, is it available in RHEL 6? - I'm using type="kvm" and I've only tested this on baremetal, but I don't want to force KVM. If only software emulation is available, I'd like to use it. - Is there an easy way to get -cpu host? Although I have the libvirt capabilities, I'd prefer not to have to parse it if I can avoid that, since libxml2 from C is so arcane. Comments: - <source mode> attribute is undocumented. Rich. ---------------------------------------------------------------------- <?xml version="1.0"?> <domain type="kvm" xmlns:qemu="http://libvirt.org/schemas/domain/qemu/1.0"> <name>1dhdpe3sb9ub2vxd</name> <memory unit="MiB">500</memory> <currentMemory unit="MiB">500</currentMemory> <vcpu>1</vcpu> <clock offset="utc"/> <os> <type>hvm</type> <kernel>/home/rjones/d/libguestfs/.guestfs-500/kernel.3198</kernel> <initrd>/home/rjones/d/libguestfs/.guestfs-500/initrd.3198</initrd> <cmdline>panic=1 console=ttyS0 udevtimeout=600 no_timer_check acpi=off printk.time=1 cgroup_disable=memory root=/dev/sdb selinux=0 guestfs_verbose=1 TERM=xterm </cmdline> </os> <devices> <controller type="scsi" index="0" model="virtio-scsi"/> <disk type="file" device="disk"> <source file="/home/rjones/d/libguestfs/test1.img"/> <target dev="sda" bus="scsi"/> <driver name="qemu" format="raw" cache="none"/> <address type="drive" controller="0" bus="0" target="0" unit="0"/> </disk> <disk type="file" device="disk"> <source file="/home/rjones/d/libguestfs/.guestfs-500/root.3198"/> <target dev="sdb" bus="scsi"/> <driver name="qemu" format="raw" cache="unsafe"/> <address type="drive" controller="0" bus="0" target="1" unit="0"/> </disk> <channel type="unix"> <source mode="bind" path="/home/rjones/d/libguestfs/libguestfsSSg3Kl/guestfsd.sock"/> <target type="virtio" name="org.libguestfs.channel.0"/> </channel> </devices> <qemu:commandline> <qemu:arg value="-set"/> <qemu:arg value="drive.drive-scsi0-0-1-0.snapshot=on"/> </qemu:commandline> </domain> /usr/bin/qemu-kvm -S -M pc-1.1 -enable-kvm -m 500 -smp 1,sockets=1,cores=1,threads=1 -name 1dhdpe3sb9ub2vxd -uuid efcc8ab8-7193-da14-a72c-acbb82a1b975 -nographic -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/home/rjones/.libvirt/qemu/lib/1dhdpe3sb9ub2vxd.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-shutdown -no-acpi -kernel /home/rjones/d/libguestfs/.guestfs-500/kernel.3198 -initrd /home/rjones/d/libguestfs/.guestfs-500/initrd.3198 -append panic=1 console=ttyS0 udevtimeout=600 no_timer_check acpi=off printk.time=1 cgroup_disable=memory root=/dev/sdb selinux=0 guestfs_verbose=1 TERM=xterm -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x4 -drive file=/home/rjones/d/libguestfs/test1.img,if=none,id=drive-scsi0-0-0-0,format=raw,cache=none -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=driv! e-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 -drive file=/home/rjones/d/libguestfs/.guestfs-500/root.3198,if=none,id=drive-scsi0-0-1-0,format=raw,cache=unsafe -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0 -chardev socket,id=charchannel0,path=/home/rjones/d/libguestfs/libguestfsSSg3Kl/guestfsd.sock,server,nowait -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.libguestfs.channel.0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 -set drive.drive-scsi0-0-1-0.snapshot=on

2 18

[libvirt] [PATCHv5 0/2] Implementation of virConnectListAllDomains() for esx and hyperv
by Peter Krempa 23 Jul '12

23 Jul '12

This is the rest of the virConnectListAllDomains() that is not yet merged. I've rebased it to current upstream and bumped the version numbers. Peter Krempa (2): hyperv: Add implementation for virConnectListAllDomains() esx: Add implementation for virConnectListAllDomains() src/esx/esx_driver.c | 195 ++++++++++++++++++++++++++++++++++++++++++++ src/hyperv/hyperv_driver.c | 136 ++++++++++++++++++++++++++++++ 2 files changed, 331 insertions(+), 0 deletions(-) -- 1.7.8.6

1 2

[libvirt] [PATCH 00/23] Convert remaining areas of code to use virReportError
by Daniel P. Berrange 23 Jul '12

23 Jul '12

6 52

[libvirt] [PATCHv2 0/6] Add usb controller model="none"
by Peter Krempa 23 Jul '12

23 Jul '12

This is a rebase of the previous version. There are no changes except solving conflicts in tests/qemuxml2argvtest.c after new tests were added lately. This series adds support for completely disabling USB bus for a host if a user requires this. For this to work a new USB controller model "none" was added that removes the USB bus. The controller is added in patches 2-4. Patch 1 cleans up some nits (and is not necessary) and patches 5 and 6 tweak qemuxml2argvtest and add tests to check the new controller. Peter Krempa (6): maint: Clean up coding style domain_conf: Add USB controler model "none" domain_conf: Add helpers to verify if device configuration is valid qemu: Add support for "none" USB controller tests: Add support for catching domain XML parsing errors tests: Add tests to check the new USB "none" controller docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 121 +++++- src/conf/domain_conf.h | 6 + src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 29 +- src/qemu/qemu_driver.c | 13 +- .../qemuxml2argvdata/qemuxml2argv-usb-none-hub.xml | 19 + .../qemuxml2argv-usb-none-other.xml | 19 + .../qemuxml2argv-usb-none-usbtablet.xml | 21 + tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 5 + tests/qemuxml2argvdata/qemuxml2argv-usb-none.xml | 16 + tests/qemuxml2argvtest.c | 515 ++++++++++---------- 12 files changed, 495 insertions(+), 272 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none-hub.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none-other.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none-usbtablet.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none.xml -- 1.7.8.6

3 16

[libvirt] [PATCH] Fix time keeping example for the guest clock
by Doug Goldstein 23 Jul '12

23 Jul '12

The time keeping example was missing quotes which resulted in an error if you copied and pasted the example into a domain's XML. Additionally the rest of the examples use single quotes (') instead of double quotes (") so standardized that. --- docs/formatdomain.html.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b6e0d5d..b8db76e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -983,11 +983,11 @@ <pre> ... - <clock offset="localtime"> - <timer name="rtc" tickpolicy="catchup" track="guest"> - <catchup threshold=123 slew=120 limit=10000/> + <clock offset='localtime'> + <timer name='rtc' tickpolicy='catchup' track='guest'> + <catchup threshold='123' slew='120' limit='10000'/> </timer> - <timer name="pit" tickpolicy="delay"/> + <timer name='pit' tickpolicy='delay'/> </clock> ...</pre> -- 1.7.8.6

2 1

[libvirt] [PATCH] Fix test failure when no IPv6 is avail
by Doug Goldstein 23 Jul '12

23 Jul '12

When the system doesn't have IPv6 available (e.g. not built into the kernel or the module isn't loaded), you can not create an IPv6 socket. The test determines earlier on that IPv6 isn't available then goes and creates a socket. This makes socket creation conditional on IPv6 availability. --- tests/virnetsockettest.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 204113e..33c6fd4 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -90,11 +90,13 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, if ((s4 = socket(AF_INET, SOCK_STREAM, 0)) < 0) goto cleanup; - if ((s6 = socket(AF_INET6, SOCK_STREAM, 0)) < 0) - goto cleanup; + if (*hasIPv6) { + if ((s6 = socket(AF_INET6, SOCK_STREAM, 0)) < 0) + goto cleanup; - if (setsockopt(s6, IPPROTO_IPV6, IPV6_V6ONLY, &only, sizeof(only)) < 0) - goto cleanup; + if (setsockopt(s6, IPPROTO_IPV6, IPV6_V6ONLY, &only, sizeof(only)) < 0) + goto cleanup; + } memset(&in4, 0, sizeof(in4)); memset(&in6, 0, sizeof(in6)); @@ -114,13 +116,16 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, } goto cleanup; } - if (bind(s6, (struct sockaddr *)&in6, sizeof(in6)) < 0) { - if (errno == EADDRINUSE) { - VIR_FORCE_CLOSE(s4); - VIR_FORCE_CLOSE(s6); - continue; + + if (*hasIPv6) { + if (bind(s6, (struct sockaddr *)&in6, sizeof(in6)) < 0) { + if (errno == EADDRINUSE) { + VIR_FORCE_CLOSE(s4); + VIR_FORCE_CLOSE(s6); + continue; + } + goto cleanup; } - goto cleanup; } *freePort = BASE_PORT + i; -- 1.7.8.6

2 1

[libvirt] Preferred CPU model not allowed by hypervisor
by Jared 23 Jul '12

23 Jul '12

Hi. I'm having a weird problem where libvirt/qemu/kvm won't let me use the model processor I have defined in my domain's config file. Instead, I get the error message in libvirtd.log that: warning : x86Decode:1346 : Preferred CPU model Nehalem not allowed by hypervisor; closest supported model will be used If I review the qemu log for that particular domain, I see that my CPU has been changed to this: -cpu kvm64,+lahf_lm,+popcnt,+sse4.2,+sse4.1,+ssse3 (in other places, I see it set to core2duo rather than kvm64) However, it *should* be Nehalem. For some background, I'm running lvm on a westmere proc, which is the successor to Nehalem. I'm specifying Nehalem as the target platform, though, to make it easier to migrate to another server if necessary. I do have this same problem if I set this to Westmere, though, so it's not unique to Nehalem. As for support and capabilities, libvirt correctly detects my host CPU as Westmere: $ virsh capabilities | grep model <model>Westmere</model> qemu-kvm does (as far as I can tell) support Nehalem: $ qemu-kvm -cpu ?model | grep Nehalem x86 Nehalem Intel Core i7 9xx (Nehalem Class Core i7) Nehalem is defined in qmeu's target-x86_64.conf: grep Nehalem /etc/qemu/target-x86_64.conf name = "Nehalem" model_id = "Intel Core i7 9xx (Nehalem Class Core i7)" And if I run a cpu check on the processor, it seems to work fine: $ qemu-kvm -cpu Nehalem,check VNC server running on `127.0.0.1:5900' So, I I'm creating the new domain as a virt-install with the qemu-kvm backend as follows: virt-install --name=test --ram=1024 --arch=x86_64 --vcpus=2 --cpu=Nehalem --virt-type=kvm <SNIP> This results in the following cpu configuration: <cpu mode='custom' match='exact'> <model fallback='allow'>Nehalem</model> </cpu> But then, when I start this domain, I get the error message posted above. Any ideas what's going on here? I'm at a loss, and unfortunately I don't have much experience with kvm/libvirt just yet so I don't know what I should be focusing on for troubleshooting. Would appreciate any suggestions or guidance. Thanks. -- Jared

3 4

[libvirt] [RFC] [PATCH] Support for uevent netlink and hotplug event.
by tangchen 23 Jul '12

23 Jul '12

NOTE: This patch is just for some comments, so that we can try to improve netlink support in libvirt. This patch introduces a new global array servers[MAX_LINKS], and all the netlink protocol (at most 32 protocols) can be supportted. And also, it creates a NETLINK_KOBJECT_UEVENT socket to listen to hotplug events. Signed-off-by: Tang Chen <tangchen(a)cn.fujitsu.com> --- src/libvirt_private.syms | 1 + src/util/virnetlink.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetlink.h | 5 +++ 3 files changed, 109 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7373281..0ef21d9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1378,6 +1378,7 @@ virNetlinkEventServiceIsRunning; virNetlinkEventServiceLocalPid; virNetlinkEventServiceStop; virNetlinkEventServiceStart; +virNetlinkEventServiceStartProtocol; virNetlinkShutdown; virNetlinkStartup; diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index bb0dae9..489c149 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -98,6 +98,7 @@ static int nextWatch = 1; # define NETLINK_EVENT_ALLOC_EXTENT 10 static virNetlinkEventSrvPrivatePtr server = NULL; +static virNetlinkEventSrvPrivatePtr servers[MAX_LINKS] = {NULL}; static virNetlinkHandle *placeholder_nlhandle = NULL; /* Function definitions */ @@ -307,6 +308,8 @@ virNetlinkEventCallback(int watch, return; } + VIR_INFO("%s", msg); + virNetlinkEventServerLock(srv); VIR_DEBUG("dispatching to max %d clients, called from event watch %d", @@ -398,6 +401,106 @@ int virNetlinkEventServiceLocalPid(void) /** + * virNetlinkEventServiceStartProtocol: + * + * start a monitor to receive netlink messages for libvirtd. + * This registers a netlink socket with the event interface. + * + * @protocol: netlink protocol + * @groups: broadcast groups to join + * Returns -1 if the monitor cannot be registered, 0 upon success + */ +int +virNetlinkEventServiceStartProtocol(int protocol, int groups) +{ + virNetlinkEventSrvPrivatePtr srv; + int fd; + int ret = -1; + + if (protocol < 0 || protocol >= MAX_LINKS || + groups < 0 || groups >= 32) { + return -EINVAL; + } + + if (servers[protocol]) + return 0; + + VIR_INFO("starting netlink event service with protocol %d", protocol); + + if (VIR_ALLOC(srv) < 0) { + virReportOOMError(); + return -1; + } + + if (virMutexInit(&srv->lock) < 0) { + VIR_FREE(srv); + return -1; + } + + virNetlinkEventServerLock(srv); + + /* Allocate a new socket and get fd */ + srv->netlinknh = virNetlinkAlloc(); + + if (!srv->netlinknh) { + virReportSystemError(errno, + "%s", _("cannot allocate nlhandle for virNetlinkEvent server")); + goto error_locked; + } + + nl_join_groups(srv->netlinknh, groups); + + if (nl_connect(srv->netlinknh, protocol) < 0) { + virReportSystemError(errno, + "%s", _("cannot connect to netlink socket")); + goto error_server; + } + + fd = nl_socket_get_fd(srv->netlinknh); + + if (fd < 0) { + virReportSystemError(errno, + "%s", _("cannot get netlink socket fd")); + goto error_server; + } + + if (nl_socket_set_nonblocking(srv->netlinknh)) { + virReportSystemError(errno, "%s", + _("cannot set netlink socket nonblocking")); + goto error_server; + } + + if ((srv->eventwatch = virEventAddHandle(fd, + VIR_EVENT_HANDLE_READABLE, + virNetlinkEventCallback, + srv, NULL)) < 0) { + netlinkError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to add netlink event handle watch")); + goto error_server; + } + + srv->netlinkfd = fd; + VIR_DEBUG("netlink event listener on fd: %i running", fd); + + ret = 0; + servers[protocol] = srv; + +error_server: + if (ret < 0) { + nl_close(srv->netlinknh); + virNetlinkFree(srv->netlinknh); + } +error_locked: + virNetlinkEventServerUnlock(srv); + if (ret < 0) { + virMutexDestroy(&srv->lock); + VIR_FREE(srv); + } + return ret; +} + + +/** * virNetlinkEventServiceStart: * * start a monitor to receive netlink messages for libvirtd. diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 8ec27c9..256f129 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -59,6 +59,11 @@ int virNetlinkEventServiceStop(void); int virNetlinkEventServiceStart(void); /** + * startNetlinkEventServerProtocol: start a monitor with specified protocol to receive netlink messages for libvirtd + */ +int virNetlinkEventServiceStartProtocol(int protocol, int groups); + +/** * virNetlinkEventServiceIsRunning: returns if the netlink event service is running. */ bool virNetlinkEventServiceIsRunning(void); -- 1.7.10.2

2 3

[libvirt] [Libvirt][PATCH] ESX: Fix ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY
by Ata E Husain Bohra 23 Jul '12

23 Jul '12

Fix addresses two issues: 1. Fix generator code to allow deep copy operation for objects with Dynamic_Cast capabilities. 2. Add missing deep copy routine to Long datatype. Signed-off-by: Ata E Husain Bohra <ata.husain(a)hotmail.com> --- src/esx/esx_vi_generator.py | 2 +- src/esx/esx_vi_types.c | 29 ++++++++++++++++++++++++++++- src/esx/esx_vi_types.h | 1 + 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 8a128df..97b8e15 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -832,7 +832,7 @@ class Object(Type): else: if self.features & Object.FEATURE__DEEP_COPY: source += "/* esxVI_%s_DeepCopy */\n" % self.name - source += "ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY(%s)\n" % self.name + source += "ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY(%s,\n" % self.name source += "{\n" for extended_by in self.extended_by: diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 844fb65..8211c93 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -549,6 +549,21 @@ } +#define ESX_VI__TEMPLATE__DEEPCOPY_DISPATCH(_actual_type, __type, _dispatch, \ + _error_return) \ + switch (_actual_type) { \ + _dispatch \ + \ + case esxVI_Type_##__type: \ + break; \ + \ + default: \ + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, \ + _("Call to %s for unexpected type '%s'"), __FUNCTION__, \ + esxVI_Type_ToString(_actual_type)); \ + return _error_return; \ + } + #define ESX_VI__TEMPLATE__DISPATCH__FREE(_type) \ case esxVI_Type_##_type: \ @@ -559,7 +574,7 @@ #define ESX_VI__TEMPLATE__DISPATCH__DEEP_COPY(_type) \ case esxVI_Type_##_type: \ - return esxVI_##_type##_DeepCopy((esxVI_##_type **)dst, \ + return esxVI_##_type##_DeepCopy((esxVI_##_type **)dest, \ (esxVI_##_type *)src); @@ -584,6 +599,12 @@ +#define ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY(__type, _dispatch, _body) \ + ESX_VI__TEMPLATE__DEEP_COPY(__type, \ + ESX_VI__TEMPLATE__DEEPCOPY_DISPATCH(src->_type, __type, _dispatch, -1) \ + _body) + + #define ESX_VI__TEMPLATE__DYNAMIC_FREE(__type, _dispatch, _body) \ ESX_VI__TEMPLATE__FREE(__type, \ ESX_VI__TEMPLATE__DISPATCH(item->_type, __type, _dispatch, \ @@ -1334,6 +1355,12 @@ ESX_VI__TEMPLATE__VALIDATE(Long, { }) +/* esxVI_Long_DeepCopy */ +ESX_VI__TEMPLATE__DEEP_COPY(Long, +{ + (*dest)->value = src->value; +}) + /* esxVI_Long_AppendToList */ ESX_VI__TEMPLATE__LIST__APPEND(Long) diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h index 3d843bf..e8d355e 100644 --- a/src/esx/esx_vi_types.h +++ b/src/esx/esx_vi_types.h @@ -235,6 +235,7 @@ struct _esxVI_Long { int esxVI_Long_Alloc(esxVI_Long **number); void esxVI_Long_Free(esxVI_Long **numberList); int esxVI_Long_Validate(esxVI_Long *number); +int esxVI_Long_DeepCopy(esxVI_Long **dest, esxVI_Long *src); int esxVI_Long_AppendToList(esxVI_Long **numberList, esxVI_Long *number); int esxVI_Long_CastFromAnyType(esxVI_AnyType *anyType, esxVI_Long **number); int esxVI_Long_Serialize(esxVI_Long *number, const char *element, -- 1.7.9.5

3 2