- Devel - libvirt List Archives

[libvirt] FD passing for chardevs and chardev backend multiplexing
by Daniel P. Berrange 09 Dec '15

09 Dec '15

Historically libvirt has connected stdout & stderr from QEMU directly to a plain file (/var/log/libvirt/qemu/$GUESTNAME.log). This has worked well enough in general, but is susceptible to a guest denial of service if the guest can cause QEMU to spew messages to stderr. There are enough places in QEMU and SPICE that still print to stderr that this isn't very hard to achieve. So In libvirt 1.3.0 we introduce a new daemon 'virtlogd' which is used for handling log file writing. When this is used, QEMU's stdout/stderr will be connected to an anonymous pipe file descriptor, the other end of which is held by the virtlogd daemon. The virtlogd daemon will only permit a fixed file size to be created before rotating the log file, so we no longer have the possibility of unbounded disk usage, which is nice. I'm now looking to extend the use of 'virtlogd' to also handle character devices. OpenStack has historically configured the primary serial port to log to a file in order to capture kernel boot up messages and later report them to the user via its API. This serial port file backend is of course susceptible to the same disk space denial of service. We don't really want to push file rotation logic into QEMU because that would involve giving QEMU permission to create / rename files, which is undesirable from a security POV. We also prefer a solution that ideally works with existing QEMU builds. So for this my plan is to stop using the QEMU 'file' backend for char devs and instead pass across a pre-opened file descriptor, connected to virtlogd. There is no "officially documented" way to pass in a file descriptor to QEMU chardevs, but since QEMU uses qemu_open(), we can make use of the fdset feature to achieve this. eg eg, consider fd 33 is the write end of a pipe file descriptor I can (in theory) do -add-fd set=2,fd=33 -chardev file,id=charserial0,path=/dev/fdset/2 Now in practice this doesn't work, because qmp_chardev_open_file() passes the O_CREAT|O_TRUNC flags in, which means the qemu_open() call will fail when using the pipe FD pased in via fdsets. After more investigation I found it *is* possible to use a socketpair and a pipe backend though... -add-fd set=2,fd=33 -chardev pipe,id=charserial0,path=/dev/fdset/2 ..because for reasons I don't understand, if QEMU can't open $PATH.in and $PATH.out, it'll fallback to just opening $PATH in read-write mode even. AFAICT, this is pretty useless with pipes since they are unidirectional, but, it works nicely with socketpairs, where virtlogd has one of the socketpairs and QEMU gets passed the other via fdset. I can easily check this works for historical QEMU versions back to when fdsets support was added to chardevs, but I'm working if the QEMU maintainers consider this usage acceptable over the long term, and if so, should we explicitly document it as supported ? If not, should we introduce a more explicit syntax for passing in a pre-opened FD for chardevs ? eg -add-fd set=2,fd=33 -chardev fd,id=charserial0,path=/dev/fdset/2 Or just make -chardev file,id=charserial0,path=/dev/fdset/2 actually work ? Or something else ? OpenStack has a further requirement to allow use of the serial port as an interactive console, at the same time that it is logging to a file which is something QEMU can't support at all currently. This essentially means being able to have multiple chardev backends all connected to the same serial frontend - specifically we would need a TCP backend and a file backend concurrently. Again this could be implemented in QEMU, but we'd prefer something that works with existing QEMU. This is not too difficult to achieve with virtlogd really. Instead of using the QEMU 'tcp' or 'unix' chardev protocol, we'd just always pass QEMU a pre-opened socketpair, and then leave the TCP/UNIX socket listening to the virtlogd daemon. This is portable with existing QEMU versions, but the obvious downside with this is extra copies in the interactive console path. So might it be worth exploring the posibility of a chardev multiplexor in QEMU. We would still pass in a pre-opened socketpair to QEMU for the logging side of things, but would leave the TCP/UNIX socket listening upto QEMU still. eg should we make something like this work: -add-fd set=2,fd=33 -chardev pipe,id=charserial0file,path=/dev/fdset/2 -chardev socket,id=charserial0tcp,host=127.0.0.1,port=9999,telnet,server,nowait -chardev multiplex,id=charserial0,muxA=charserial0file,muxB=charserial1 -serial isa-serial,chardev=charserial0,id=serial0 Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

3 3

[libvirt] [PATCH v2 00/27] Prepare for specific vcpu hot(un)plug - part 1
by Peter Krempa 09 Dec '15

09 Dec '15

This series is getting rather big. The target is to refactor the way libvirt stores info about vCPUs into a single structure (okay, two structures for the qemu driver. Part 1 is not yet completely there, well, not even halfway. Future work will involve fully allocating priv->vcpupids to the maxcpus size and moving around few other bits of data in cputune and other parts to the new structure. Yet another follow up work is then to add new APIs for vCPU hotplug, which will enable adding vCPUs sparsely (useful if you have NUMA). Since this refactor will result in tracking all vcpu-related data in one struct, the result will automagically fix a few bugs where we'd end up with invalid config after vcpu unplug or other operations. Version 2 does not contain already pushed patches and incorporates feedback from John's review. Since I've changed quite a few things I'm reposting this. Peter Krempa (27): conf: Replace writes to def->maxvcpus with accessor conf: Use local copy of maxvcpus in virDomainVcpuParse conf: Extract update of vcpu count if maxvcpus is decreased conf: Add helper to check whether domain has offline vCPUs conf: Replace read access to def->maxvcpus with accessor conf: Replace writes to def->vcpus with accessor conf: Move vcpu count check into helper conf: Replace read accesses to def->vcpus with accessor conf: Turn def->maxvcpus into size_t qemu: domain: Add helper to access vm->privateData->agent qemu: Extract vCPU onlining/offlining via agent into a separate function qemu: qemuDomainSetVcpusAgent: re-check agent before calling it the again qemu: Split up vCPU hotplug and hotunplug qemu: cpu hotplug: Fix error handling logic qemu: monitor: Remove weird return values from qemuMonitorSetCPU qemu: cpu hotplug: Move loops to qemuDomainSetVcpusFlags qemu: Refactor qemuDomainHotplugVcpus qemu: refactor qemuDomainHotunplugVcpus conf: turn def->vcpus into a structure conf: ABI: Split up and improve vcpu info ABI checking conf: Add helper to get pointer to a certain vCPU definition qemu: cgroup: Remove now unreachable check qemu: Drop checking vcpu threads in emulator bandwidth getter/setter qemu: Replace checking for vcpu<->pid mapping availability with a helper qemu: Add helper to retrieve vCPU pid qemu: driver: Refactor qemuDomainHelperGetVcpus qemu: cgroup: Don't use priv->ncpupids to iterate domain vCPUs src/bhyve/bhyve_command.c | 2 +- src/bhyve/bhyve_driver.c | 2 +- src/conf/domain_audit.c | 2 +- src/conf/domain_conf.c | 190 ++++++++++++--- src/conf/domain_conf.h | 20 +- src/hyperv/hyperv_driver.c | 10 +- src/libvirt_private.syms | 6 + src/libxl/libxl_conf.c | 6 +- src/libxl/libxl_driver.c | 40 ++-- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_native.c | 7 +- src/openvz/openvz_conf.c | 7 +- src/openvz/openvz_driver.c | 19 +- src/phyp/phyp_driver.c | 12 +- src/qemu/qemu_cgroup.c | 42 ++-- src/qemu/qemu_command.c | 29 ++- src/qemu/qemu_domain.c | 47 ++++ src/qemu/qemu_domain.h | 4 + src/qemu/qemu_driver.c | 542 ++++++++++++++++++++++--------------------- src/qemu/qemu_monitor.c | 3 + src/qemu/qemu_monitor_json.c | 8 - src/qemu/qemu_monitor_text.c | 23 +- src/qemu/qemu_process.c | 22 +- src/test/test_driver.c | 38 +-- src/uml/uml_driver.c | 2 +- src/vbox/vbox_common.c | 19 +- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 38 +-- src/vz/vz_driver.c | 8 +- src/vz/vz_sdk.c | 13 +- src/xen/xm_internal.c | 19 +- src/xenapi/xenapi_driver.c | 7 +- src/xenapi/xenapi_utils.c | 6 +- src/xenconfig/xen_common.c | 16 +- src/xenconfig/xen_sxpr.c | 27 ++- 36 files changed, 767 insertions(+), 475 deletions(-) -- 2.6.2

1 28

[libvirt] Handling large amount of VF's with intelligent passthrough
by Jan Gutter 09 Dec '15

09 Dec '15

Hi, I've run into a rather interesting problem recently where a weird interaction between libnl3 and libvirt caused some difficult-to-debug issues. From libvirt's side, the issue was that a netlink response was much larger than the pagesize and truncated by libnl3. When virNetDevLinkDump() calls virNetlinkCommand(), nl_recv() is supposed to return a rather large structure with information for all the Virtual Functions. When called in a system where the number of PCIe Virtual Functions are more than 30 for a given Physical Function, the netlink response is larger than 4k, meaning that a message is truncated. Unfortunately libnl3 truncates this silently, meaning that a cryptic error pops up much later in virNetDevParseVfConfig(), "missing IFLA_VF_INFO in netlink response". Aside from the error propagation (which might be fixable in libnl3), there still remains the need to enable libvirt to function in cases like this. This can be done in two ways, both in virNetlinkCommand(). 1. Message peeking can be enabled. In theory this slows down any netlink messages by doing a two stage query: query the buffer size, then allocate the receive buffer and receive the message. This is a reliability/performance tradeoff, I guess. This is as simple as adding: nl_socket_enable_msg_peek(nlhandle); 2. The receive buffer size can also be made larger: nl_socket_set_msg_buf_size(nlhandle, ARBITRARY_BUFFER_SIZE); This does not incur a performance penalty, but until libnl3 can propagate the truncation error, this merely postpones the error for future generations... Jan

3 5

[libvirt] [PATCH v3 0/6] Add read error ignore to storage backend vol info APIs
by John Ferlan 09 Dec '15

09 Dec '15

v2 here: http://www.redhat.com/archives/libvir-list/2015-November/thread.html Based on review and well just the amount of change I figured I'd generate a v3. The patches were mostly ACK'd, but patch 3 required removal of some flags which resulted in patch 1 needing updates... Then I found that what I'd done in patch 3 regarding returning errors needed to generate a patch 2.5... So I just bit the bullet and am posting the patches again. Patches 2, 4, and 5 of this series are unchanged. While patch 1 removes 'readflags' from an API, patch 3 is new, and patch 6 uses the new name. John Ferlan (6): storage: Add readflags for backend error processing storage: Add comments for backend APIs storage: Set ret = -1 on failures in virStorageBackendUpdateVolTargetInfo storage: Handle readflags errors storage: Add debug message storage: Ignore block devices that fail format detection src/storage/storage_backend.c | 83 ++++++++++++++++++++++++++++++----- src/storage/storage_backend.h | 15 ++++++- src/storage/storage_backend_disk.c | 5 ++- src/storage/storage_backend_fs.c | 4 +- src/storage/storage_backend_logical.c | 2 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_scsi.c | 6 ++- 7 files changed, 96 insertions(+), 21 deletions(-) -- 2.5.0

2 7

[libvirt] [PATCH v2] guest-agent-socket: don't generate default path to config XML
by Pavel Hrdina 09 Dec '15

09 Dec '15

While we started using for all unix sockets as default one common directory based on a guest name it introduced several issues, for example with renaming the guest or cloning it. In general it's not entirely bad, but in this case it would be best to hide the auto-generated socket path from user and don't export it in the config XML. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Version 2: - removed unnecessary changes src/qemu/qemu_command.c | 28 ++++++++++++++++++++++++++++ src/qemu/qemu_command.h | 1 + src/qemu/qemu_domain.c | 16 ---------------- src/qemu/qemu_driver.c | 3 +++ src/qemu/qemu_process.c | 3 +++ tests/qemuhotplugtest.c | 5 +++++ tests/qemuxml2argvtest.c | 5 +++++ 7 files changed, 45 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2a9fab5..f1bb621 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1262,6 +1262,34 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) } +int +qemuUnixSocketGenerate(virDomainDefPtr def, + virQEMUDriverConfigPtr cfg) +{ + size_t i; + + for (i = 0; i < def->nchannels; i++) { + virDomainChrDefPtr channel = def->channels[i]; + + if (channel->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && + channel->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && + channel->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && + !channel->source.data.nix.path) { + if (virAsprintf(&channel->source.data.nix.path, + "%s/domain-%s/%s", + cfg->channelTargetDir, def->name, + channel->target.name ? channel->target.name + : "unknown.sock") < 0) + return -1; + + channel->source.data.nix.listen = true; + } + } + + return 0; +} + + static void qemuDomainPrimeVirtioDeviceAddresses(virDomainDefPtr def, virDomainDeviceAddressType type) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index bebdd27..0512a23 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -283,6 +283,7 @@ int qemuAssignDevicePCISlots(virDomainDefPtr def, virDomainPCIAddressSetPtr addrs); int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps); +int qemuUnixSocketGenerate(virDomainDefPtr def, virQEMUDriverConfigPtr cfg); int qemuDomainNetVLAN(virDomainNetDefPtr def); int qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx); int qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ed21245..7e05289 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1329,22 +1329,6 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, ARCH_IS_S390(def->os.arch)) dev->data.controller->model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI; - /* auto generate unix socket path */ - if (dev->type == VIR_DOMAIN_DEVICE_CHR && - dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && - dev->data.chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && - dev->data.chr->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && - !dev->data.chr->source.data.nix.path) { - if (virAsprintf(&dev->data.chr->source.data.nix.path, - "%s/domain-%s/%s", - cfg->channelTargetDir, def->name, - dev->data.chr->target.name ? dev->data.chr->target.name - : "unknown.sock") < 0) - goto cleanup; - - dev->data.chr->source.data.nix.listen = true; - } - /* forbid capabilities mode hostdev in this kind of hypervisor */ if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ae1d8e7..39f2f03 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7254,6 +7254,9 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, if (qemuAssignDeviceAliases(def, qemuCaps) < 0) goto cleanup; + if (qemuUnixSocketGenerate(def, cfg) < 0) + goto cleanup; + if (qemuDomainAssignAddresses(def, qemuCaps, NULL) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 192730c..29cf965 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4663,6 +4663,9 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0) goto cleanup; + if (qemuUnixSocketGenerate(vm->def, cfg) < 0) + goto cleanup; + /* Get the advisory nodeset from numad if 'placement' of * either <vcpu> or <numatune> is 'auto'. */ diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 102e052..b17cca2 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -61,6 +61,7 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, { int ret = -1; qemuDomainObjPrivatePtr priv = NULL; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(&driver); if (!(*vm = virDomainObjNew(xmlopt))) goto cleanup; @@ -94,10 +95,14 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0) goto cleanup; + if (qemuUnixSocketGenerate((*vm)->def, cfg) < 0) + goto cleanup; + (*vm)->def->id = QEMU_HOTPLUG_TEST_DOMAIN_ID; ret = 0; cleanup: + virObjectUnref(cfg); return ret; } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f7596a0..f6083db 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -262,6 +262,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virCommandPtr cmd = NULL; size_t i; virBitmapPtr nodeset = NULL; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(&driver); if (!(conn = virGetConnect())) goto out; @@ -324,6 +325,9 @@ static int testCompareXMLToArgvFiles(const char *xml, if (qemuAssignDeviceAliases(vmdef, extraFlags) < 0) goto out; + if (qemuUnixSocketGenerate(vmdef, cfg) < 0) + goto out; + for (i = 0; i < vmdef->nhostdevs; i++) { virDomainHostdevDefPtr hostdev = vmdef->hostdevs[i]; @@ -387,6 +391,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virCommandFree(cmd); virDomainDefFree(vmdef); virObjectUnref(conn); + virObjectUnref(cfg); virBitmapFree(nodeset); return ret; } -- 2.6.3

2 1

[libvirt] somtimes libvirtd crashed when fail to start a guest, need help to debug
by Luyao Huang 09 Dec '15

09 Dec '15

Dear list, I met a problem when test with the latest libvirt (build from current master branch), i found sometimes libvirtd crashed when guest fail to start. the reproduce way is very easy, but hard to meet: # cat /root/shdo2.sh #！/bin/sh while : do virsh start rhel7.0-rhel done # sh /root/shdo2.sh ... error: Failed to start domain rhel7.0-rhel error: internal error: process exited while connecting to monitor: 2015-12-09T06:58:37.785695Z qemu-kvm: -chardev socket,id=charchannel1,path=/var/lib/libvirt/qemu1/rhel7.0-rhel.agent,server,nowait: Failed to bind socket to /var/lib/libvirt/qemu1/rhel7.0-rhel.agent: No such file or directory error: Failed to start domain rhel7.0-rhel error: internal error: process exited while connecting to monitor: 2015-12-09T06:58:42.035103Z qemu-kvm: -chardev socket,id=charchannel1,path=/var/lib/libvirt/qemu1/rhel7.0-rhel.agent,server,nowait: Failed to bind socket to /var/lib/libvirt/qemu1/rhel7.0-rhel.agent: No such file or directory error: Disconnected from qemu:///system due to I/O error error: Failed to start domain rhel7.0-rhel error: End of file while reading data: Input/output error error: One or more references were leaked after disconnect from the hypervisor error: failed to connect to the hypervisor error: no valid connection error: Failed to connect socket to '/var/run/libvirt/libvirt-sock': Connection refused and here is the bt full output: http://pastebin.com/sCYHByvP and here is the valgrind output: http://pastebin.com/0VXrYTKT I cannot found what happened, also i am not familiar with virtlogd. could someone please help to debug this ? Thanks, Luyao

1 0

[libvirt] [PATCH v2] log: include hostname in initial log message
by Daniel P. Berrange 09 Dec '15

09 Dec '15

On the very first log message we send to any output, we include the libvirt version number and package string. In some bug reports we have been given libvirtd.log files that came from a different host than the corresponding /var/log/libvirt/qemu log files. So extend the initial log message to include the hostname too. eg on first log message we would now see: $ libvirtd 2015-12-04 17:35:36.610+0000: 20917: info : libvirt version: 1.3.0 2015-12-04 17:35:36.610+0000: 20917: info : hostname: dhcp-1-180.lcy.redhat.com 2015-12-04 17:35:36.610+0000: 20917: error : qemuMonitorIO:687 : internal error: End of file from monitor Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt_private.syms | 1 + src/util/virlog.c | 72 ++++++++++++++++++++++++++++++++++++------------ src/util/virutil.c | 34 ++++++++++++++++------- src/util/virutil.h | 1 + 4 files changed, 81 insertions(+), 27 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index dd085c3..f483c4c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2387,6 +2387,7 @@ virGetGroupID; virGetGroupList; virGetGroupName; virGetHostname; +virGetHostnameQuiet; virGetListenFDs; virGetSCSIHostNameByParentaddr; virGetSCSIHostNumber; diff --git a/src/util/virlog.c b/src/util/virlog.c index 627f4cb..7d5a266 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -94,7 +94,7 @@ static int virLogNbFilters; * after filtering, multiple output can be used simultaneously */ struct _virLogOutput { - bool logVersion; + bool logInitMessage; void *data; virLogOutputFunc f; virLogCloseFunc c; @@ -402,7 +402,7 @@ virLogDefineOutput(virLogOutputFunc f, goto cleanup; } ret = virLogNbOutputs++; - virLogOutputs[ret].logVersion = true; + virLogOutputs[ret].logInitMessage = true; virLogOutputs[ret].f = f; virLogOutputs[ret].c = c; virLogOutputs[ret].data = data; @@ -452,6 +452,32 @@ virLogVersionString(const char **rawmsg, return virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, VIR_LOG_VERSION_STRING); } +/* Similar to virGetHostname() but avoids use of error + * reporting APIs or logging APIs, to prevent recursion + */ +static int +virLogHostnameString(const char **rawmsg, + char **msg) +{ + char *hostname = virGetHostnameQuiet(); + char *hoststr; + + if (!hostname) + return -1; + + if (virAsprintfQuiet(&hoststr, "hostname: %s", hostname) < 0) { + VIR_FREE(hostname); + return -1; + } + + if (virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, hoststr) < 0) { + VIR_FREE(hoststr); + return -1; + } + *rawmsg = hoststr; + return 0; +} + static void virLogSourceUpdate(virLogSourcePtr source) @@ -533,7 +559,7 @@ virLogVMessage(virLogSourcePtr source, const char *fmt, va_list vargs) { - static bool logVersionStderr = true; + static bool logInitMessageStderr = true; char *str = NULL; char *msg = NULL; char timestamp[VIR_TIME_STRING_BUFLEN]; @@ -583,16 +609,22 @@ virLogVMessage(virLogSourcePtr source, */ for (i = 0; i < virLogNbOutputs; i++) { if (priority >= virLogOutputs[i].priority) { - if (virLogOutputs[i].logVersion) { - const char *rawver; - char *ver = NULL; - if (virLogVersionString(&rawver, &ver) >= 0) + if (virLogOutputs[i].logInitMessage) { + const char *rawinitmsg; + char *initmsg = NULL; + if (virLogVersionString(&rawinitmsg, &initmsg) >= 0) + virLogOutputs[i].f(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, 0, rawinitmsg, initmsg, + virLogOutputs[i].data); + VIR_FREE(initmsg); + if (virLogHostnameString(&rawinitmsg, &initmsg) >= 0) virLogOutputs[i].f(&virLogSelf, VIR_LOG_INFO, __FILE__, __LINE__, __func__, - timestamp, NULL, 0, rawver, ver, + timestamp, NULL, 0, rawinitmsg, initmsg, virLogOutputs[i].data); - VIR_FREE(ver); - virLogOutputs[i].logVersion = false; + VIR_FREE(initmsg); + virLogOutputs[i].logInitMessage = false; } virLogOutputs[i].f(source, priority, filename, linenr, funcname, @@ -601,16 +633,22 @@ virLogVMessage(virLogSourcePtr source, } } if (virLogNbOutputs == 0) { - if (logVersionStderr) { - const char *rawver; - char *ver = NULL; - if (virLogVersionString(&rawver, &ver) >= 0) + if (logInitMessageStderr) { + const char *rawinitmsg; + char *initmsg = NULL; + if (virLogVersionString(&rawinitmsg, &initmsg) >= 0) + virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, 0, rawinitmsg, initmsg, + (void *) STDERR_FILENO); + VIR_FREE(initmsg); + if (virLogHostnameString(&rawinitmsg, &initmsg) >= 0) virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, __FILE__, __LINE__, __func__, - timestamp, NULL, 0, rawver, ver, + timestamp, NULL, 0, rawinitmsg, initmsg, (void *) STDERR_FILENO); - VIR_FREE(ver); - logVersionStderr = false; + VIR_FREE(initmsg); + logInitMessageStderr = false; } virLogOutputToFd(source, priority, filename, linenr, funcname, diff --git a/src/util/virutil.c b/src/util/virutil.c index fe65faf..e83def1 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -662,16 +662,17 @@ char *virIndexToDiskName(int idx, const char *prefix) * we got from getaddrinfo(). Return the value from gethostname() * and hope for the best. */ -char *virGetHostname(void) +static char *virGetHostnameImpl(bool quiet) { int r; - char hostname[HOST_NAME_MAX+1], *result; + char hostname[HOST_NAME_MAX+1], *result = NULL; struct addrinfo hints, *info; r = gethostname(hostname, sizeof(hostname)); if (r == -1) { - virReportSystemError(errno, - "%s", _("failed to determine host name")); + if (!quiet) + virReportSystemError(errno, + "%s", _("failed to determine host name")); return NULL; } NUL_TERMINATE(hostname); @@ -683,7 +684,7 @@ char *virGetHostname(void) * string as-is; it's up to callers to check whether "localhost" * is allowed. */ - ignore_value(VIR_STRDUP(result, hostname)); + ignore_value(VIR_STRDUP_QUIET(result, hostname)); goto cleanup; } @@ -696,9 +697,10 @@ char *virGetHostname(void) hints.ai_family = AF_UNSPEC; r = getaddrinfo(hostname, NULL, &hints, &info); if (r != 0) { - VIR_WARN("getaddrinfo failed for '%s': %s", - hostname, gai_strerror(r)); - ignore_value(VIR_STRDUP(result, hostname)); + if (!quiet) + VIR_WARN("getaddrinfo failed for '%s': %s", + hostname, gai_strerror(r)); + ignore_value(VIR_STRDUP_QUIET(result, hostname)); goto cleanup; } @@ -711,17 +713,29 @@ char *virGetHostname(void) * localhost. Ignore the canonicalized name and just return the * original hostname */ - ignore_value(VIR_STRDUP(result, hostname)); + ignore_value(VIR_STRDUP_QUIET(result, hostname)); else /* Caller frees this string. */ - ignore_value(VIR_STRDUP(result, info->ai_canonname)); + ignore_value(VIR_STRDUP_QUIET(result, info->ai_canonname)); freeaddrinfo(info); cleanup: + if (!result) { + virReportOOMError(); + } return result; } +char *virGetHostname(void) +{ + return virGetHostnameImpl(false); +} + +char *virGetHostnameQuiet(void) +{ + return virGetHostnameImpl(true); +} char * virGetUserDirectory(void) diff --git a/src/util/virutil.h b/src/util/virutil.h index 02387e0..535807c 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -132,6 +132,7 @@ static inline int pthread_sigmask(int how, # endif char *virGetHostname(void); +char *virGetHostnameQuiet(void); char *virGetUserDirectory(void); char *virGetUserDirectoryByUID(uid_t uid); -- 2.5.0

2 1

[libvirt] Event after reverting to snapshot
by Dmitry Andreev 09 Dec '15

09 Dec '15

Hi, I'm looking for a way to catch an event about reverting to snapshot. As I can see in the code there is no lifecycle event if VM state wasn't changed. The comment in the code of qemuDomainRevertToSnapshot: /* We have the following transitions, which create the following events: * 1. inactive -> inactive: none * 2. inactive -> running: EVENT_STARTED * 3. inactive -> paused: EVENT_STARTED, EVENT_PAUSED * 4. running -> inactive: EVENT_STOPPED * 5. running -> running: none * 6. running -> paused: EVENT_PAUSED * 7. paused -> inactive: EVENT_STOPPED * 8. paused -> running: EVENT_RESUMED * 9. paused -> paused: none * Also, several transitions occur even if we fail partway through, * and use of FORCE can cause multiple transitions. */ Also there is no VIR_DOMAIN_EVENT_DEFINED event after reverting to snapshot, even when domain configuration is changed. Isn't that strange? Checked on stopped VM. Is there any way to catch event about changes in configuration after reverting to snapshot.

2 1

[libvirt] [PATCH 0/6] Add multiqueue support for macvtaps
by Michal Privoznik 08 Dec '15

08 Dec '15

Some patches are easier to review when showed with --ignore-space-change. Michal Privoznik (6): virNetDevMacVLanCreateWithVPortProfile: Turn vnet_hdr into flag virNetDevMacVLanTapOpen: Slightly rework virNetDevMacVLanTapOpen: Rework to support multiple FDs virNetDevMacVLanTapSetup: Rework to support multiple FDs virNetDevMacVLanCreateWithVPortProfile: Rework to support multiple FDs qemu: Enable multiqueue for macvtaps src/lxc/lxc_process.c | 3 +- src/qemu/qemu_command.c | 61 +++++++++------- src/qemu/qemu_command.h | 2 + src/qemu/qemu_hotplug.c | 16 +++-- src/util/virnetdevmacvlan.c | 171 ++++++++++++++++++++++++-------------------- src/util/virnetdevmacvlan.h | 13 ++-- 6 files changed, 150 insertions(+), 116 deletions(-) -- 2.4.10

6 21

[libvirt] [PATCH] rpm: explicitly enable & start virlockd/virtlogd sockets on install
by Daniel P. Berrange 08 Dec '15

08 Dec '15

When installing the libvirt-daemon RPM, we have a %post rule to enable the libvirtd.service, virtlockd.socket and virtlogd.socket files. This is only done, however, when the RPM is first installed, not when upgrading RPMs. This adds a separate rule to explicitly enable the virtlockd.socket and virtlogd.socket units upon RPM upgrade, if libvirtd.service is marked as enabled. It also adds a rule to start the socket units if libvirtd.service is running. The downside with taking this approach is that it is impossible for a user to have libvirtd.service enabled and disable socket activation, because we'll re-enable it on every upgrade. Similarly we'll be starting the socket listeners on every upgrade if libvirtd is running. This is a pretty nasty thing to have to keep in libvirt for the long term, given this upgrade problem is a one-time only pain point. For this reason I am recommending *NOT* applying this patch to GIT. Instead, I think we just have to release note the fact that after upgrading you should enable the virtlockd.socket unit. --- libvirt.spec.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1f76f24..48e5632 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1703,6 +1703,18 @@ if [ $1 -eq 1 ] ; then libvirtd.service >/dev/null 2>&1 || : fi %endif + +# In upgrade scenario we must explicitly enable virtlockd/virtlogd +# sockets, if libvirtd is already enabled and start them if +# libvirtd is running, otherwise you'll get failures to start +# guests +if [ $1 -ge 1 ] ; then + /bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 && + /bin/systemctl enable virtlockd.socket virtlogd.socket + /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 && + /bin/systemctl start virtlockd.socket virtlogd.socket +fi + %else %if %{with_cgconfig} # Starting with Fedora 16/RHEL-7, systemd automounts all cgroups, -- 2.5.0

2 5

[libvirt] Sparse image volDownload
by Michal Privoznik 08 Dec '15

08 Dec '15

Dear list, I'd like to hear your opinion on the following bug: https://bugzilla.redhat.com/show_bug.cgi?id=1282859 Long story short, Imagine the following scenario: 1. Create 4GB file full of zeroes 2. virsh vol-download it What happens is that all those 4GB are transferred byte after byte through our RPC system. Not only this puts needles pressure on our event loop, it's suboptimal for network and other resources too. I'd like to explore our options here keeping in mind that the original volume might have been sparse and we ought to keep it sparse on the destination too. In the bug the reporter (Matthew Booth) suggests introducing new type of RPC message that will let us keep our APIs unchanged. The source will scan the file for windows of zeroes bigger than some value. When found the new type of message is passed to client without need to copy those zeroes. Yes, this is very similar to RLE. If we are going that way, should we enable users to put a compression program in between read()/write() and our RPC? Well, should we let users to choose what compression program we will put there? Because there are better compression algorithms than RLE. Michal

3 6

[libvirt] Entering freeze for libvirt-1.3.0
by Daniel Veillard 08 Dec '15

08 Dec '15

As planned I have tagged RC1 in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ there is significant changes in this release so people are really encouraged to give it a good try. I will try to push rc2 possibly in the week-end and shooting for a release on Tuesday next week i.e. Dec 8th, thanks for testing it ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 8

[libvirt] [PATCH] rpm: explicitly enable & start virtlogd on install
by Daniel P. Berrange 07 Dec '15

07 Dec '15

When installing the libvirt-daemon RPM, we have a %post rule to enable the libvirtd.service, virtlockd.socket and virtlogd.socket files. This is only done, however, when the RPM is first installed, not when upgrading RPMs. So virtlogd will not get activated on upgrading, which is a problem as libvirt qemu driver will expect it to be available by default. This adds a trigger that is run when uninstalling libvirt-daemon older than 1.3.0 that will enable & start virtlogd.socket if libvirtd is enabled and/or started. Using the trigger rather than %post ensures that it only runs once, allowing admins to disable it explicitly thereafter without future upgrades re-enabling it. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1f76f24..ff25881 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1779,6 +1779,25 @@ if [ "$1" -ge "1" ]; then fi %endif +# In upgrade scenario we must explicitly enable virtlockd/virtlogd +# sockets, if libvirtd is already enabled and start them if +# libvirtd is running, otherwise you'll get failures to start +# guests +%triggerpostun daemon -- libvirt-daemon < 1.3.0 +if [ $1 -ge 1 ] ; then + %if %{with_systemd} + /bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 && + /bin/systemctl enable virtlogd.socket || : + /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 && + /bin/systemctl start virtlogd.socket || : + %else + /sbin/chkconfig libvirtd 1>/dev/null 2>&1 && + /bin/chkconfig virtlogd on || : + /sbin/service libvirtd status 1>/dev/null 2>&1 && + /bin/service virtlogd start || : + %endif +fi + %if %{with_network} %post daemon-config-network if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; then -- 2.5.0

1 0

[libvirt] libvirt-php 0.5.1 uneeded files
by Remi Collet 07 Dec '15

07 Dec '15

Installing the new 0.5.1 version: libvirt-php.la libvirt-php.so -> libvirt-php.so.0.0.0 libvirt-php.so.0 -> libvirt-php.so.0.0.0 libvirt-php.so.0.0.0 This is not a versioned library but a PHP extension so having those have no sense. Only libvirt-php.so is needed. Notice: I think it will be simpler to switch to the standard PHP extension build system (phpize; configure; make) Especially, this will allow to use the --with-php-config option (an thus, build for not standard PHP, e.g. TS build or SCL build) Remi.

3 8

[libvirt] [PATCH] libvirtd: enable virtlockd/virtlogd socket activation on install
by Daniel P. Berrange 07 Dec '15

07 Dec '15

When someone does 'systemctl enable libvirtd.service' we should also enable virtlockd.socket/virtlogd.socket, so that they can be auto-activated if libvirtd tries to access the sockets. Without this, people have to manually enable the units themselves via 'systemctl enable virtdlogd.socket'. This also ensures that if distros uses 'systemctl preset' for enabling 'libvirtd.service', then the virtdlogd.socket gets enabled without having to wait for the distro to update their presets file. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/libvirtd.service.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index 9e67e43..608221c 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -22,3 +22,5 @@ Restart=on-failure [Install] WantedBy=multi-user.target +Also=virtlockd.socket +Also=virtlogd.socket -- 2.5.0

2 1

[libvirt] [libvirt-glib][PATCH] Drop unused finalize function
by Michal Privoznik 07 Dec '15

07 Dec '15

After 1225a160ac3b4 where I'm dropping some unused variables, the functions I was touching became sort of redundant too. Specifically, gvir_domain_disk_finalize() and gvir_domain_interface_finalize(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- libvirt-gobject/libvirt-gobject-domain-disk.c | 8 -------- libvirt-gobject/libvirt-gobject-domain-interface.c | 8 -------- 2 files changed, 16 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index 7f34ebd..bb2a682 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -49,16 +49,8 @@ gvir_domain_disk_error_quark(void) return g_quark_from_static_string("gvir-domain-disk"); } -static void gvir_domain_disk_finalize(GObject *object) -{ - G_OBJECT_CLASS(gvir_domain_disk_parent_class)->finalize(object); -} - static void gvir_domain_disk_class_init(GVirDomainDiskClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = gvir_domain_disk_finalize; g_type_class_add_private(klass, sizeof(GVirDomainDiskPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index 443a2b6..beae11e 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -49,16 +49,8 @@ gvir_domain_interface_error_quark(void) return g_quark_from_static_string("gvir-domain-interface"); } -static void gvir_domain_interface_finalize(GObject *object) -{ - G_OBJECT_CLASS(gvir_domain_interface_parent_class)->finalize(object); -} - static void gvir_domain_interface_class_init(GVirDomainInterfaceClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = gvir_domain_interface_finalize; g_type_class_add_private(klass, sizeof(GVirDomainInterfacePrivate)); } -- 2.4.10

2 1

[libvirt] [libvirt-glib][PATCH] gobject: Drop some unused variables
by Michal Privoznik 07 Dec '15

07 Dec '15

After abe983ddf8a569 there are some variables, that are unused: CC libvirt_gobject_1_0_la-libvirt-gobject-domain-disk.lo CC libvirt_gobject_1_0_la-libvirt-gobject-domain-interface.lo CC libvirt_gobject_1_0_la-libvirt-gobject-domain.lo CC libvirt_gobject_1_0_la-libvirt-gobject-interface.lo ../../libvirt-gobject/libvirt-gobject-domain-interface.c: In function 'gvir_domain_interface_finalize': ../../libvirt-gobject/libvirt-gobject-domain-interface.c:54:26: error: unused variable 'self' [-Werror=unused-variable] GVirDomainInterface *self = GVIR_DOMAIN_INTERFACE(object); ^ cc1: all warnings being treated as errors Makefile:724: recipe for target 'libvirt_gobject_1_0_la-libvirt-gobject-domain-interface.lo' failed make[3]: *** [libvirt_gobject_1_0_la-libvirt-gobject-domain-interface.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... ../../libvirt-gobject/libvirt-gobject-domain-disk.c: In function 'gvir_domain_disk_finalize': ../../libvirt-gobject/libvirt-gobject-domain-disk.c:54:21: error: unused variable 'self' [-Werror=unused-variable] GVirDomainDisk *self = GVIR_DOMAIN_DISK(object); ^ cc1: all warnings being treated as errors Makefile:717: recipe for target 'libvirt_gobject_1_0_la-libvirt-gobject-domain-disk.lo' failed Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. libvirt-gobject/libvirt-gobject-domain-disk.c | 2 -- libvirt-gobject/libvirt-gobject-domain-interface.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index 770acff..7f34ebd 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -51,8 +51,6 @@ gvir_domain_disk_error_quark(void) static void gvir_domain_disk_finalize(GObject *object) { - GVirDomainDisk *self = GVIR_DOMAIN_DISK(object); - G_OBJECT_CLASS(gvir_domain_disk_parent_class)->finalize(object); } diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index 57896fd..443a2b6 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -51,8 +51,6 @@ gvir_domain_interface_error_quark(void) static void gvir_domain_interface_finalize(GObject *object) { - GVirDomainInterface *self = GVIR_DOMAIN_INTERFACE(object); - G_OBJECT_CLASS(gvir_domain_interface_parent_class)->finalize(object); } -- 2.4.10

2 1

[libvirt] [PATCH v2] libxl: free ifname on libxlDomainMigrationPrepareDef
by Joao Martins 07 Dec '15

07 Dec '15

Commit d2e5538b1 changes virDomainDef to include ifnames that autogenerated by libxl, and that are also cleared on domain cleanup. One place that's missing is on migration, when domain xml is sent to dst libvirtd and would contain ifnames from the source libvirtd. This would lead to erronous behaviour (as seen in osstest CI) such as failing to migrate when a vif with the same name existed (belonging to another domain) on destination. This patch adds a helper libxlDomainFreeIfaceNames for clearing ifnames on both migration prepare phase and domain cleanup. It is done on prepare phase so that we don't affect source domain (specially in cases when the migration fails), while still allowing interface stats to be consulted during the migration. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- Changes since v1: - Commit message is changed - Clear ifnames on prepare phase as opposed to begin phase. --- src/libxl/libxl_domain.c | 32 ++++++++++++++++++++++---------- src/libxl/libxl_domain.h | 3 +++ src/libxl/libxl_migration.c | 2 ++ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ef92974..487589d 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -728,16 +728,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, } } - if ((vm->def->nnets)) { - size_t i; - - for (i = 0; i < vm->def->nnets; i++) { - virDomainNetDefPtr net = vm->def->nets[i]; - - if (STRPREFIX(net->ifname, "vif")) - VIR_FREE(net->ifname); - } - } + libxlDomainFreeIfaceNames(vm->def); if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) > 0) { if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) @@ -923,6 +914,27 @@ libxlDomainCreateIfaceNames(virDomainDefPtr def, libxl_domain_config *d_config) } } +/* + * Removes autogenerated interface names for the network devices in + * parameter def. User-provided interface names are skipped. + */ +void +libxlDomainFreeIfaceNames(virDomainDefPtr def) +{ + size_t i; + + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + + if (!net->ifname) + continue; + + if (STRPREFIX(net->ifname, "vif")) + VIR_FREE(net->ifname); + } +} + + /* * Start a domain through libxenlight. diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 44b3e0b..70c139c 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -135,6 +135,9 @@ int libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm); +void +libxlDomainFreeIfaceNames(virDomainDefPtr def); + int libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 0d23e5f..1ca31ab 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -288,6 +288,8 @@ libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto cleanup; + libxlDomainFreeIfaceNames(def); + if (dname) { name = def->name; if (VIR_STRDUP(def->name, dname) < 0) { -- 2.1.4

2 4

[libvirt] [PATCH RFC 0/3] Add a "flags" element to storage pool source
by John Ferlan 05 Dec '15

05 Dec '15

https://bugzilla.redhat.com/show_bug.cgi?id=1265694 Posting as an RFC mainly to get buyin/feedback over the concept of using a <flags> field in the <pool> <source> as a way to allow or direct the pool/storage backend code to use specific algorithms. The issue is described in the bz, but the shorter version is the disk backend needs a way to tell libvirt_parthelper to format output for dm-multipath volumes in a slight different manner. In order to do that I chose a new flag to call libvirt_parthelper to indicate the way to output, but I needed a way to have the disk backend determine whether to add the flag or not. Could have read /etc/multipath.conf - not a good option... Don't want to read their config file. If there was an API to get that data, it would have been nice, but then we'd have to rely on a specific version of multipath that had the API (a dependency that we don't want). So I chose to roll our own. I figure there could be other uses of such kind of flags - for example currently logical volume pools use a model of thin volume support that is "older". A newer model is there, but IIRC the "format" of the lvs output wouldn't mesh. So if there was a way to say, use this format of support in preference, then we could easily add that support with the caveat that one couldn't expect an "old" thin pool to work. IOW, use the much improved algorithm knowing that it's a "new" pool rather than having to mess with "conversions"... Perhaps other pools may find uses, but this one came to mind since I have a long dormant set of changes that uses the new thin pool options... John Ferlan (3): conf: Add flags to the storage pool source storage: Add new flag for libvirt_parthelper conf: Parse/use a flags argument in the storage pool xml docs/formatstorage.html.in | 33 ++++++++++++++++++++ docs/schemas/storagepool.rng | 9 ++++++ src/conf/storage_conf.c | 41 +++++++++++++++++++++++++ src/conf/storage_conf.h | 11 +++++++ src/storage/parthelper.c | 15 +++++++-- src/storage/storage_backend_disk.c | 7 +++++ tests/storagepoolxml2xmlin/pool-disk-flags.xml | 15 +++++++++ tests/storagepoolxml2xmlout/pool-disk-flags.xml | 15 +++++++++ tests/storagepoolxml2xmltest.c | 1 + 9 files changed, 144 insertions(+), 3 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-disk-flags.xml create mode 100644 tests/storagepoolxml2xmlout/pool-disk-flags.xml -- 2.5.0

1 3

[libvirt] [PATCH] doc: extend virDomainSetMemory semantics
by Nikolay Shirokovskiy 05 Dec '15

05 Dec '15

virDomainSetMemory is documented to change only runtime configuration of running domain. This can't be implemented for vz driver as it always change persistent state too. Let's extend semantics of this function for changes to be hyperviror specific. As a result 'virsh setmem' without parameters (which ends up in virDomainSetMemory call) would be possible for a vz domain. By the way, virsh documentation for this case states that behaviour is hypervisor specific already. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/libvirt-domain.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index de7eb04..56ab907 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -1882,8 +1882,9 @@ virDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) * to Domain0 i.e. the domain where the application runs. * This function may require privileged access to the hypervisor. * - * This command only changes the runtime configuration of the domain, - * so can only be called on an active domain. + * This command is hypervisor-specific for whether active, persistent, + * or both configurations are changed; for more control, use + * virDomainSetMemoryFlags(). * * Returns 0 in case of success and -1 in case of failure. */ -- 1.7.1

2 1

[libvirt] [PATCH 0/4] Some ABI incompatible changes to virtlogd
by Daniel P. Berrange 05 Dec '15

05 Dec '15

Having looked at the code again there is a wire-ABI incompatible change I think we should make to virtlogd to make it more flexible. Since we've not released 1.3.0 yet, this is the only chance we'll have to change the wire protocol. There are also a couple of fixes in this series we should have before release. Daniel P. Berrange (4): qemu: fix memory leak in opening log file logging: preserve driver, dom name & uuid against log file logging: change log protocol to be more reusable logging: validate flags passed from client in virtlogd src/logging/log_daemon_dispatch.c | 14 ++-- src/logging/log_handler.c | 135 +++++++++++++++++++------------------- src/logging/log_handler.h | 14 ++-- src/logging/log_manager.c | 18 ++--- src/logging/log_manager.h | 9 +-- src/logging/log_protocol.x | 7 +- src/qemu/qemu_domain.c | 47 ++++++------- 7 files changed, 114 insertions(+), 130 deletions(-) -- 2.5.0

2 6

[libvirt] [PATCH] libxl: free ifname on migration begin phase
by Joao Martins 05 Dec '15

05 Dec '15

Commit d2e5538b1 changes virDomainDef to create ifnames that are autogenerated by libxl, and also clearing them up on domain cleanup. One place that was missing was also on migration, when domain xml is sent to dst libvirtd and would contain ifnames from the source libvirtd. This would lead to erronous behaviour (as seen in osstest CI) such as failing to migrate when a vif with the a name that existed on the destination host (belonging to another domain). This patch adds an helper libxlDomainFreeIfaceNames for freeing autogenerated ifnames on both migration begin phase and domain cleanup. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- src/libxl/libxl_domain.c | 32 ++++++++++++++++++++++---------- src/libxl/libxl_domain.h | 3 +++ src/libxl/libxl_migration.c | 2 ++ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ef92974..487589d 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -728,16 +728,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, } } - if ((vm->def->nnets)) { - size_t i; - - for (i = 0; i < vm->def->nnets; i++) { - virDomainNetDefPtr net = vm->def->nets[i]; - - if (STRPREFIX(net->ifname, "vif")) - VIR_FREE(net->ifname); - } - } + libxlDomainFreeIfaceNames(vm->def); if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) > 0) { if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) @@ -923,6 +914,27 @@ libxlDomainCreateIfaceNames(virDomainDefPtr def, libxl_domain_config *d_config) } } +/* + * Removes autogenerated interface names for the network devices in + * parameter def. User-provided interface names are skipped. + */ +void +libxlDomainFreeIfaceNames(virDomainDefPtr def) +{ + size_t i; + + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + + if (!net->ifname) + continue; + + if (STRPREFIX(net->ifname, "vif")) + VIR_FREE(net->ifname); + } +} + + /* * Start a domain through libxenlight. diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 44b3e0b..70c139c 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -135,6 +135,9 @@ int libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm); +void +libxlDomainFreeIfaceNames(virDomainDefPtr def); + int libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 0d23e5f..1ee19ae 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -249,6 +249,8 @@ libxlDomainMigrationBegin(virConnectPtr conn, def = tmpdef; } else { def = vm->def; + + libxlDomainFreeIfaceNames(def); } if (!libxlDomainMigrationIsAllowed(def)) -- 2.1.4

1 1

[libvirt] [PATCH 0/3] libvirt: Fix automatic SCSI controller create in hotplug
by Boris Fiuczynski 05 Dec '15

05 Dec '15

Trying to hotplug a SCSI device to a domain without the required SCSI controller fails. For hostdev SCSI device hotplug commits 0d8b24f6 and 0785966d rearranged the automatic creation of the required SCSI controllers from the parsing xml code into the post parsing code section of virDomainDefParseXML. In doing so the code will create but not hotplug the missing SCSI controller and on the hotplug path thru the same code the SCSI controller will not get hotplugged since it already exits. Then the SCSI hostdev device is hotplugged and runs into the following internal error error: Failed to attach device from scsidev.xml error: internal error: Device alias was not set for scsi controller with index 0 For disk SCSI device hotplug commit 0260506c added in method qemuBuildDriveDevStr a lookup of the controller alias. The internal error error: Failed to attach device from scsi_disk.xml error: internal error: Could not find scsi controller with index 0 required for device occurs because in method qemuDomainAttachSCSIDisk the automatic creation of the missing SCSI controller occurs after calling qemuBuildDriveDevStr. Boris Fiuczynski (3): conf: Reposition adding SCSI controller for SCSI hostdev hotplug Revert "conf: Try controller add when searching hostdev bus for unit" Automatic SCSI controller creation in SCSI disk hotplug broken src/conf/domain_conf.c | 16 ++++------------ src/qemu/qemu_hotplug.c | 12 ++++++------ 2 files changed, 10 insertions(+), 18 deletions(-) -- 2.3.0

2 16

[libvirt] [PATCH] log: include hostname in initial log message
by Daniel P. Berrange 05 Dec '15

05 Dec '15

On the very first log message we send to any output, we include the libvirt version number and package string. In some bug reports we have been given libvirtd.log files that came from a different host than the corresponding /var/log/libvirt/qemu log files. So extend the initial log message to include the hostname too. eg on first log message we would now see: $ libvirtd 2015-12-04 17:35:36.610+0000: 20917: info : libvirt version: 1.3.0 2015-12-04 17:35:36.610+0000: 20917: info : dhcp-1-180.lcy.redhat.com 2015-12-04 17:35:36.610+0000: 20917: error : qemuMonitorIO:687 : internal error: End of file from monitor Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- cfg.mk | 2 +- src/util/virlog.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 98 insertions(+), 18 deletions(-) diff --git a/cfg.mk b/cfg.mk index cf3f36c..2e3af1a 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1160,7 +1160,7 @@ _src2=src/(util/vircommand|libvirt|lxc/lxc_controller|locking/lock_daemon|loggin exclude_file_name_regexp--sc_prohibit_fork_wrappers = \ (^($(_src2)|tests/testutils|daemon/libvirtd)\.c$$) -exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/virutil\.c$$ +exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/vir(log|util)\.c$$ exclude_file_name_regexp--sc_prohibit_internal_functions = \ ^src/(util/(viralloc|virutil|virfile)\.[hc]|esx/esx_vi\.c)$$ diff --git a/src/util/virlog.c b/src/util/virlog.c index 627f4cb..34e7f2a 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -39,6 +39,7 @@ #if HAVE_SYS_UN_H # include <sys/un.h> #endif +#include <netdb.h> #include "virerror.h" #include "virlog.h" @@ -94,7 +95,7 @@ static int virLogNbFilters; * after filtering, multiple output can be used simultaneously */ struct _virLogOutput { - bool logVersion; + bool logInitMessage; void *data; virLogOutputFunc f; virLogCloseFunc c; @@ -402,7 +403,7 @@ virLogDefineOutput(virLogOutputFunc f, goto cleanup; } ret = virLogNbOutputs++; - virLogOutputs[ret].logVersion = true; + virLogOutputs[ret].logInitMessage = true; virLogOutputs[ret].f = f; virLogOutputs[ret].c = c; virLogOutputs[ret].data = data; @@ -452,6 +453,73 @@ virLogVersionString(const char **rawmsg, return virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, VIR_LOG_VERSION_STRING); } +/* Similar to virGetHostname() but avoids use of error + * reporting APIs or logging APIs, to prevent recursion + */ +static int +virLogHostnameString(const char **rawmsg, + char **msg) +{ + int r; + char hostname[HOST_NAME_MAX+1]; + struct addrinfo hints, *info; + char *result = NULL; + + *rawmsg = *msg = NULL; + r = gethostname(hostname, sizeof(hostname)); + if (r == -1) + return -1; + NUL_TERMINATE(hostname); + + if (STRPREFIX(hostname, "localhost") || strchr(hostname, '.')) { + /* in this case, gethostname returned localhost (meaning we can't + * do any further canonicalization), or it returned an FQDN (and + * we don't need to do any further canonicalization). Return the + * string as-is; it's up to callers to check whether "localhost" + * is allowed. + */ + ignore_value(VIR_STRDUP_QUIET(result, hostname)); + goto cleanup; + } + + /* otherwise, it's a shortened, non-localhost, hostname. Attempt to + * canonicalize the hostname by running it through getaddrinfo + */ + + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_CANONNAME|AI_CANONIDN; + hints.ai_family = AF_UNSPEC; + r = getaddrinfo(hostname, NULL, &hints, &info); + if (r != 0) { + ignore_value(VIR_STRDUP_QUIET(result, hostname)); + goto cleanup; + } + + /* Tell static analyzers about getaddrinfo semantics. */ + sa_assert(info); + + if (info->ai_canonname == NULL || + STRPREFIX(info->ai_canonname, "localhost")) + /* in this case, we tried to canonicalize and we ended up back with + * localhost. Ignore the canonicalized name and just return the + * original hostname + */ + ignore_value(VIR_STRDUP_QUIET(result, hostname)); + else + /* Caller frees this string. */ + ignore_value(VIR_STRDUP_QUIET(result, info->ai_canonname)); + + freeaddrinfo(info); + + cleanup: + if (virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, result) < 0) { + VIR_FREE(result); + return -1; + } + *rawmsg = result; + return 0; +} + static void virLogSourceUpdate(virLogSourcePtr source) @@ -533,7 +601,7 @@ virLogVMessage(virLogSourcePtr source, const char *fmt, va_list vargs) { - static bool logVersionStderr = true; + static bool logInitMessageStderr = true; char *str = NULL; char *msg = NULL; char timestamp[VIR_TIME_STRING_BUFLEN]; @@ -583,16 +651,22 @@ virLogVMessage(virLogSourcePtr source, */ for (i = 0; i < virLogNbOutputs; i++) { if (priority >= virLogOutputs[i].priority) { - if (virLogOutputs[i].logVersion) { - const char *rawver; - char *ver = NULL; - if (virLogVersionString(&rawver, &ver) >= 0) + if (virLogOutputs[i].logInitMessage) { + const char *rawinitmsg; + char *initmsg = NULL; + if (virLogVersionString(&rawinitmsg, &initmsg) >= 0) + virLogOutputs[i].f(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, 0, rawinitmsg, initmsg, + virLogOutputs[i].data); + VIR_FREE(initmsg); + if (virLogHostnameString(&rawinitmsg, &initmsg) >= 0) virLogOutputs[i].f(&virLogSelf, VIR_LOG_INFO, __FILE__, __LINE__, __func__, - timestamp, NULL, 0, rawver, ver, + timestamp, NULL, 0, rawinitmsg, initmsg, virLogOutputs[i].data); - VIR_FREE(ver); - virLogOutputs[i].logVersion = false; + VIR_FREE(initmsg); + virLogOutputs[i].logInitMessage = false; } virLogOutputs[i].f(source, priority, filename, linenr, funcname, @@ -601,16 +675,22 @@ virLogVMessage(virLogSourcePtr source, } } if (virLogNbOutputs == 0) { - if (logVersionStderr) { - const char *rawver; - char *ver = NULL; - if (virLogVersionString(&rawver, &ver) >= 0) + if (logInitMessageStderr) { + const char *rawinitmsg; + char *initmsg = NULL; + if (virLogVersionString(&rawinitmsg, &initmsg) >= 0) + virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, 0, rawinitmsg, initmsg, + (void *) STDERR_FILENO); + VIR_FREE(initmsg); + if (virLogHostnameString(&rawinitmsg, &initmsg) >= 0) virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, __FILE__, __LINE__, __func__, - timestamp, NULL, 0, rawver, ver, + timestamp, NULL, 0, rawinitmsg, initmsg, (void *) STDERR_FILENO); - VIR_FREE(ver); - logVersionStderr = false; + VIR_FREE(initmsg); + logInitMessageStderr = false; } virLogOutputToFd(source, priority, filename, linenr, funcname, -- 2.5.0

2 1

[libvirt] [PATCH] rotatingfile: mark log files as close-on-exec
by Daniel P. Berrange 05 Dec '15

05 Dec '15

The log file descriptor associated with the virRotatingFile struct should be marked close-on-exec, as even when virtlogd re-exec's itself it expect to open the log file fresh. It does not need to preserve the logfile handles, only the network client FDs. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virrotatingfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index a32759a..6654aff 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -108,7 +108,7 @@ virRotatingFileWriterEntryNew(const char *path, if (VIR_ALLOC(entry) < 0) return NULL; - if ((entry->fd = open(path, O_CREAT|O_APPEND|O_WRONLY, mode)) < 0) { + if ((entry->fd = open(path, O_CREAT|O_APPEND|O_WRONLY|O_CLOEXEC, mode)) < 0) { virReportSystemError(errno, _("Unable to open file: %s"), path); goto error; @@ -151,7 +151,7 @@ virRotatingFileReaderEntryNew(const char *path) if (VIR_ALLOC(entry) < 0) return NULL; - if ((entry->fd = open(path, O_RDONLY)) < 0) { + if ((entry->fd = open(path, O_RDONLY|O_CLOEXEC)) < 0) { if (errno != ENOENT) { virReportSystemError(errno, _("Unable to open file: %s"), path); -- 2.5.0

2 1

[libvirt] [PATCH] qemu: include hostname in QEMU log files
by Daniel P. Berrange 05 Dec '15

05 Dec '15

Often when debugging bug reports one is given a copy of the file from /var/log/libvirt/qemu/$NAME.log along with other supporting files. In a number of cases I've been given sets of files which were from different machines. Including the hostname in the QEMU log file will help identify when the bug reporter is providing bad information. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_process.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b35fc69..e974989 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4091,16 +4091,18 @@ qemuLogOperation(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; int qemuVersion = virQEMUCapsGetVersion(priv->qemuCaps); const char *package = virQEMUCapsGetPackage(priv->qemuCaps); + char *hostname = virGetHostname(); if ((timestamp = virTimeStringNow()) == NULL) goto cleanup; - if (qemuDomainLogContextWrite(logCtxt, "%s: %s %s, qemu version: %d.%d.%d%s\n", + if (qemuDomainLogContextWrite(logCtxt, "%s: %s %s, qemu version: %d.%d.%d%s, hostname:%s\n", timestamp, msg, VIR_LOG_VERSION_STRING, (qemuVersion / 1000000) % 1000, (qemuVersion / 1000) % 1000, qemuVersion % 1000, - package ? package : "") < 0) + package ? package : "", + hostname ? hostname : "") < 0) goto cleanup; if (cmd) { @@ -4110,6 +4112,7 @@ qemuLogOperation(virDomainObjPtr vm, } cleanup: + VIR_FREE(hostname); VIR_FREE(timestamp); } -- 2.5.0

2 1

[libvirt] [PATCH v2] libxl: add p2p migration
by Joao Martins 05 Dec '15

05 Dec '15

Introduce support for VIR_MIGRATE_PEER2PEER in libxl driver for supporting migration in Openstack. Most of the changes occur at the source and no modifications at the receiver. In P2P mode there is only the Perform phase so we must handle the connection with the destination and actually perform the migration. libxlDomainPerformP2P implements the connection to the destination and let libxlDoMigrateP2P implements the actual migration logic with virConnectPtr. In this function we do the migration steps in the destination similar to virDomainMigrateVersion3Full. We appropriately save the last error reported in each of the phases to provide proper reporting. We don't yet support VIR_MIGRATE_TUNNELED and we always use V3 with extensible params, making the implementation simpler. It is worth noting that the receiver didn't have any changes, and because it's still the v3 sequence thus it is possible to migrate from a P2P to non-P2P host. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- Changes since v1: - Move Begin step to libxlDoMigrateP2P to have all 4 steps together. - Remove if before VIR_FREE(dom_xml) --- src/libxl/libxl_driver.c | 13 ++- src/libxl/libxl_migration.c | 220 ++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_migration.h | 11 +++ 3 files changed, 241 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index fcdcbdb..da98265 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4713,6 +4713,7 @@ libxlConnectSupportsFeature(virConnectPtr conn, int feature) switch (feature) { case VIR_DRV_FEATURE_TYPED_PARAM_STRING: case VIR_DRV_FEATURE_MIGRATION_PARAMS: + case VIR_DRV_FEATURE_MIGRATION_P2P: return 1; default: return 0; @@ -5039,9 +5040,15 @@ libxlDomainMigratePerform3Params(virDomainPtr dom, if (virDomainMigratePerform3ParamsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (libxlDomainMigrationPerform(driver, vm, dom_xml, dconnuri, - uri, dname, flags) < 0) - goto cleanup; + if (flags & VIR_MIGRATE_PEER2PEER) { + if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml, + dconnuri, uri, dname, flags) < 0) + goto cleanup; + } else { + if (libxlDomainMigrationPerform(driver, vm, dom_xml, dconnuri, + uri, dname, flags) < 0) + goto cleanup; + } ret = 0; diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 0d23e5f..a1c7b55 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -42,6 +42,7 @@ #include "libxl_conf.h" #include "libxl_migration.h" #include "locking/domain_lock.h" +#include "virtypedparam.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -456,6 +457,225 @@ libxlDomainMigrationPrepare(virConnectPtr dconn, return ret; } +/* This function is a simplification of virDomainMigrateVersion3Full + * excluding tunnel support and restricting it to migration v3 + * with params since it was the first to be introduced in libxl. + */ +static int +libxlDoMigrateP2P(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virConnectPtr sconn, + const char *xmlin, + virConnectPtr dconn, + const char *dconnuri ATTRIBUTE_UNUSED, + const char *dname, + const char *uri, + unsigned int flags) +{ + virDomainPtr ddomain = NULL; + virTypedParameterPtr params = NULL; + int nparams = 0; + int maxparams = 0; + char *uri_out = NULL; + char *dom_xml = NULL; + unsigned long destflags; + bool cancelled = true; + virErrorPtr orig_err = NULL; + int ret = -1; + + dom_xml = libxlDomainMigrationBegin(sconn, vm, xmlin); + if (!dom_xml) + goto cleanup; + + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_DEST_XML, dom_xml) < 0) + goto cleanup; + + if (dname && + virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_DEST_NAME, dname) < 0) + goto cleanup; + + if (uri && + virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_URI, uri) < 0) + goto cleanup; + + /* We don't require the destination to have P2P support + * as it looks to be normal migration from the receiver perpective. + */ + destflags = flags & ~(VIR_MIGRATE_PEER2PEER); + + VIR_DEBUG("Prepare3"); + virObjectUnlock(vm); + ret = dconn->driver->domainMigratePrepare3Params + (dconn, params, nparams, NULL, 0, NULL, NULL, &uri_out, destflags); + virObjectLock(vm); + + if (ret == -1) + goto cleanup; + + if (uri_out) { + if (virTypedParamsReplaceString(&params, &nparams, + VIR_MIGRATE_PARAM_URI, uri_out) < 0) { + orig_err = virSaveLastError(); + goto finish; + } + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("domainMigratePrepare3 did not set uri")); + goto finish; + } + + VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); + ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL, + uri_out, NULL, flags); + + if (ret < 0) + orig_err = virSaveLastError(); + + cancelled = (ret < 0); + + finish: + VIR_DEBUG("Finish3 ret=%d", ret); + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, NULL) <= 0 && + virTypedParamsReplaceString(&params, &nparams, + VIR_MIGRATE_PARAM_DEST_NAME, + vm->def->name) < 0) { + ddomain = NULL; + } else { + virObjectUnlock(vm); + ddomain = dconn->driver->domainMigrateFinish3Params + (dconn, params, nparams, NULL, 0, NULL, NULL, + destflags, cancelled); + virObjectLock(vm); + } + + cancelled = (ddomain == NULL); + + /* If Finish3Params set an error, and we don't have an earlier + * one we need to preserve it in case confirm3 overwrites + */ + if (!orig_err) + orig_err = virSaveLastError(); + + VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); + ret = libxlDomainMigrationConfirm(driver, vm, flags, cancelled); + + if (ret < 0) + VIR_WARN("Guest %s probably left in 'paused' state on source", + vm->def->name); + + cleanup: + if (ddomain) { + virObjectUnref(ddomain); + ret = 0; + } else { + ret = -1; + } + + if (orig_err) { + virSetError(orig_err); + virFreeError(orig_err); + } + + VIR_FREE(dom_xml); + VIR_FREE(uri_out); + virTypedParamsFree(params, nparams); + return ret; +} + +static int virConnectCredType[] = { + VIR_CRED_AUTHNAME, + VIR_CRED_PASSPHRASE, +}; + +static virConnectAuth virConnectAuthConfig = { + .credtype = virConnectCredType, + .ncredtype = ARRAY_CARDINALITY(virConnectCredType), +}; + +static void +libxlMigrationConnectionClosed(virConnectPtr conn, + int reason, + void *opaque) +{ + virDomainObjPtr vm = opaque; + + VIR_DEBUG("conn=%p, reason=%d, vm=%s", conn, reason, vm->def->name); + virDomainObjBroadcast(vm); +} + +/* On P2P mode there is only the Perform3 phase and we need to handle + * the connection with the destination libvirtd and perform the migration. + * Here we first tackle the first part of it, and libxlDoMigrationP2P handles + * the migration process with an established virConnectPtr to the destination. + */ +int +libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virConnectPtr sconn, + const char *xmlin, + const char *dconnuri, + const char *uri_str ATTRIBUTE_UNUSED, + const char *dname, + unsigned int flags) +{ + int ret = -1; + int keepAliveInterval = 5; + int keepAliveCount = 5; + bool useParams; + virConnectPtr dconn = NULL; + virErrorPtr orig_err = NULL; + + virObjectUnlock(vm); + dconn = virConnectOpenAuth(dconnuri, &virConnectAuthConfig, 0); + virObjectLock(vm); + + if (dconn == NULL) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Failed to connect to remote libvirt URI %s: %s"), + dconnuri, virGetLastErrorMessage()); + return ret; + } + + if (virConnectSetKeepAlive(dconn, keepAliveInterval, + keepAliveCount) < 0) + goto cleanup; + + if (virConnectRegisterCloseCallback(dconn, libxlMigrationConnectionClosed, + vm, NULL) < 0) { + goto cleanup; + } + + virObjectUnlock(vm); + useParams = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_PARAMS); + virObjectLock(vm); + + if (!useParams) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Destination libvirt does not support migration with extensible parameters")); + goto cleanup; + } + + ret = libxlDoMigrateP2P(driver, vm, sconn, xmlin, dconn, dconnuri, + dname, uri_str, flags); + + cleanup: + orig_err = virSaveLastError(); + virObjectUnlock(vm); + virConnectUnregisterCloseCallback(dconn, libxlMigrationConnectionClosed); + virObjectUnref(dconn); + virObjectLock(vm); + if (orig_err) { + virSetError(orig_err); + virFreeError(orig_err); + } + return ret; +} + int libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, virDomainObjPtr vm, diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h index 20b45d8..0f83bb4 100644 --- a/src/libxl/libxl_migration.h +++ b/src/libxl/libxl_migration.h @@ -28,6 +28,7 @@ # define LIBXL_MIGRATION_FLAGS \ (VIR_MIGRATE_LIVE | \ + VIR_MIGRATE_PEER2PEER | \ VIR_MIGRATE_UNDEFINE_SOURCE | \ VIR_MIGRATE_PAUSED) @@ -56,6 +57,16 @@ libxlDomainMigrationPrepare(virConnectPtr dconn, unsigned int flags); int +libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virConnectPtr sconn, + const char *dom_xml, + const char *dconnuri, + const char *uri_str, + const char *dname, + unsigned int flags); + +int libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, virDomainObjPtr vm, const char *dom_xml, -- 2.1.4

2 3

[libvirt] [PATCH] libvirtd: require virtlogd to start before libvirtd
by Guido Günther 05 Dec '15

05 Dec '15

In the non-systemd case, without socket activation, we need to proper ordering. --- daemon/libvirtd.init.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in index ed42195..22006c4 100644 --- a/daemon/libvirtd.init.in +++ b/daemon/libvirtd.init.in @@ -5,7 +5,7 @@ # ### BEGIN INIT INFO # Provides: libvirtd -# Required-Start: $network messagebus +# Required-Start: $network messagebus virtlogd # Should-Start: $named # Should-Start: xend # Should-Start: avahi-daemon -- 2.6.2

2 2

[libvirt] [PATCH v2 0/5] Add read error ignore to storage backend vol info APIs
by John Ferlan 04 Dec '15

04 Dec '15

v1 took a simplistic approach: http://www.redhat.com/archives/libvir-list/2015-October/msg00919.html but not specific enough according to the review. So adding some extra complexity of checking for specific errors and flag bits to "ignore" the error similar to the catch-all openflags VIR_STORAGE_VOL_OPEN_NOERROR for all the virStorageBackendUpdateVol{Info|TargetInfo|TargetInfoFD} API's which are used to get the volume capacity, allocation, etc. data. Along the way an inavertent bug was found and fixed in patch 3 in virStorageBackendUpdateVolTargetInfo where an error could have been reported, but not propagated back to the user since 'ret' would have been 0 after the virStorageBackendUpdateVolTargetInfoFD call. John Ferlan (5): storage: Add readflags for backend error processing storage: Add comments for backend APIs storage: Handle readflags errors storage: Add debug message storage: Ignore block devices that fail format detection src/storage/storage_backend.c | 151 +++++++++++++++++++++++++++------- src/storage/storage_backend.h | 20 ++++- src/storage/storage_backend_disk.c | 5 +- src/storage/storage_backend_fs.c | 8 +- src/storage/storage_backend_gluster.c | 2 +- src/storage/storage_backend_logical.c | 2 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_scsi.c | 6 +- 8 files changed, 153 insertions(+), 43 deletions(-) -- 2.5.0

2 10

[libvirt] [libvirt-snmp][PATCH] libvirt-snmp.spec.in: Fix changelog
by Michal Privoznik 04 Dec '15

04 Dec '15

The initial version was released on Wednesday, not Thursday. I would not care, but rpmlint is kind of sad: libvirt-snmp.src: E: specfile-error warning: bogus date in %changelog: Thu Feb 2 2011 Michal Privoznik <mprivozn(a)redhat.com> 0.0.1-1 13 packages and 0 specfiles checked; 1 errors, 0 warnings. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. libvirt-snmp.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-snmp.spec.in b/libvirt-snmp.spec.in index a4be218..c5a1a41 100644 --- a/libvirt-snmp.spec.in +++ b/libvirt-snmp.spec.in @@ -49,5 +49,5 @@ make install DESTDIR=$RPM_BUILD_ROOT - resolve licensing conflicts - add unified header to sources -* Thu Feb 2 2011 Michal Privoznik <mprivozn(a)redhat.com> 0.0.1-1 +* Wed Feb 2 2011 Michal Privoznik <mprivozn(a)redhat.com> 0.0.1-1 - initial revision -- 2.4.10

1 0

[libvirt] [PATCH LIBVIRT v1 0/2] Support maxvcpus (AKA >1 vcpu on Xen/ARM)
by Ian Campbell 04 Dec '15

04 Dec '15

libvirt currently clamps the maximum number of vcpus to MAX_VIRT_CPUS == XEN_LEGACY_MAX_VCPUS, which on ARM is 1 (because all guests are expected to support vcpu info placement). Even on x86 this limitation is a hold over from an older xm interface where the maximum number of vcpus was expressed as a bitmap and so limited to the number of bits in an unsigned long (for which XEN_LEGACY_MAX_VCPUS is a convenient proxy), which doesn't apply to xl on x86 which uses a bitmap data type to express larger bitmaps. To do this it was necessary to add a new value to xenConfigVersionEnum corresponding to this new version. I've tested with tests/x?configtest (including new test case) on x86 and on ARM with xlconfigtest and via domxml-from-native. As you might infer from some of the changlogs I feel a bit like I am abusing xendConfigVersion somewhat here (given that xl != xend, and that real xend never went passed xend_config_version) but its use is quite widespread in the common xl/xm support code in libvirt so a great deal of refactoring/renaming would otherwise seem to be required. I'm open to other ideas or suggestions though. Ian.

3 6

Re: [libvirt] libvirt to report cpuWait of a guest.
by Daniel P. Berrange 04 Dec '15

04 Dec '15

On Fri, Dec 04, 2015 at 02:12:42PM +0200, Avi Weit wrote: > Hi, > > Thank you, it sounds good. Can you please let me know how Openstack > Ceilometer will access that wait counter (vcpu.NNN.wait)? To my > understanding Openstack uses libvirt python library to access domain data. The python API has a binding to let it invoke the virDomainListGetStats API. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] libvirt to report cpuWait of a guest.
by Avi Weit 04 Dec '15

04 Dec '15

Hi, We are working on fixing CPU utilization calculation of guests (VMs) in Ceilometer metering service of OpenStack. Per that fix, we retrieve, at the host level, se.statistics.wait_sum (or se.wait_sum in old versions) Linux kernel schedstat counter of the KVM/QEMU threads ? that represent the VM. That counter denotes the time in milliseconds the thread 'wants' to run (but not actually running because of a contention). However, as Daniel Berrange mentioned in the fix review, it would be better to retrieve that information from libvirt instead and he asked me to raise this in this mailing list. I could not notice that libvirt exposes such a counter. It would be very good if virDomainInfo ( https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainInfo) can be added with cpuWait in addition to cpuTime it currently has so that cpuWait will denote the total *time* the VM *wants* to run. Adding cpuWait to any other location of domain is fine as well. Thanks, Avi Weit

2 2

[libvirt] libvirt-php 0.5.1 - missing arginfo
by Remi Collet 04 Dec '15

04 Dec '15

Hi, arginfo are very important in PHP extensions, useful for users (documentation), and various tools rely on them (through reflection). Attached patch add some. Tell me if ok, and I will continue to add more. Remi.

2 3

[libvirt] [libvirt-glib] gobject, gconfig: Drop redundant debug logging
by Zeeshan Ali (Khattak) 03 Dec '15

03 Dec '15

Justification from IRC chat: <zeenix> danpb: i'm not sure it's good to have a g_debug() for every libvirt-gobject/gconfig object creation/destruction <zeenix> danpb: the debug output becomes so big that at least I never think about enabling it at runtime and sometimes end up missing important debug info <danpb> yeah we could easily kill that <danpb> gobject has systemtap probes builtin these days which let you debug object create/finalize problems <zeenix> danpb: oh cool <zeenix> danpb: i'll write a patch --- libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c | 2 -- libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c | 2 -- libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c | 2 -- libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c | 2 -- libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c | 2 -- libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c | 2 -- libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c | 2 -- libvirt-gconfig/libvirt-gconfig-capabilities-guest.c | 2 -- libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c | 2 -- libvirt-gconfig/libvirt-gconfig-capabilities-host.c | 2 -- libvirt-gconfig/libvirt-gconfig-capabilities.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-address-pci.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-address-usb.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-address.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-channel.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-chardev.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-clock.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-console.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-controller.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-cpu.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-device.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-graphics.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-input.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c | 2 -- .../libvirt-gconfig-domain-interface-filterref-parameter.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-interface-network.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-interface-user.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-interface.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-memballoon.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-os.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-parallel.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-power-management.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-redirdev.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-seclabel.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-serial.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-smartcard.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-snapshot.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-sound.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-timer.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain-video.c | 2 -- libvirt-gconfig/libvirt-gconfig-domain.c | 2 -- libvirt-gconfig/libvirt-gconfig-interface.c | 2 -- libvirt-gconfig/libvirt-gconfig-network-filter.c | 2 -- libvirt-gconfig/libvirt-gconfig-network.c | 2 -- libvirt-gconfig/libvirt-gconfig-node-device.c | 2 -- libvirt-gconfig/libvirt-gconfig-object.c | 4 ---- libvirt-gconfig/libvirt-gconfig-secret.c | 2 -- libvirt-gconfig/libvirt-gconfig-storage-permissions.c | 2 -- libvirt-gconfig/libvirt-gconfig-storage-pool-source.c | 2 -- libvirt-gconfig/libvirt-gconfig-storage-pool-target.c | 2 -- libvirt-gconfig/libvirt-gconfig-storage-pool.c | 2 -- libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c | 2 -- libvirt-gconfig/libvirt-gconfig-storage-vol-target.c | 2 -- libvirt-gconfig/libvirt-gconfig-storage-vol.c | 2 -- libvirt-gconfig/libvirt-gconfig-xml-doc.c | 4 ---- libvirt-gobject/libvirt-gobject-connection.c | 4 ---- libvirt-gobject/libvirt-gobject-domain-device.c | 4 ---- libvirt-gobject/libvirt-gobject-domain-disk.c | 4 ---- libvirt-gobject/libvirt-gobject-domain-interface.c | 4 ---- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 4 ---- libvirt-gobject/libvirt-gobject-domain.c | 4 ---- libvirt-gobject/libvirt-gobject-input-stream.c | 1 - libvirt-gobject/libvirt-gobject-interface.c | 4 ---- libvirt-gobject/libvirt-gobject-manager.c | 4 ---- libvirt-gobject/libvirt-gobject-network-dhcp-lease.c | 4 ---- libvirt-gobject/libvirt-gobject-network-filter.c | 4 ---- libvirt-gobject/libvirt-gobject-network.c | 4 ---- libvirt-gobject/libvirt-gobject-node-device.c | 4 ---- libvirt-gobject/libvirt-gobject-output-stream.c | 1 - libvirt-gobject/libvirt-gobject-secret.c | 4 ---- libvirt-gobject/libvirt-gobject-storage-pool.c | 4 ---- libvirt-gobject/libvirt-gobject-storage-vol.c | 4 ---- libvirt-gobject/libvirt-gobject-stream.c | 2 -- 97 files changed, 226 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c index b691b57..b52c0bf 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c @@ -44,8 +44,6 @@ static void gvir_config_capabilities_cpu_feature_class_init(GVirConfigCapabiliti static void gvir_config_capabilities_cpu_feature_init(GVirConfigCapabilitiesCpuFeature *feature) { - g_debug("Init GVirConfigCapabilitiesCpuFeature=%p", feature); - feature->priv = GVIR_CONFIG_CAPABILITIES_CPU_FEATURE_GET_PRIVATE(feature); } diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c index 002b77f..14630a0 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c @@ -42,8 +42,6 @@ static void gvir_config_capabilities_cpu_model_class_init(GVirConfigCapabilities static void gvir_config_capabilities_cpu_model_init(GVirConfigCapabilitiesCpuModel *model) { - g_debug("Init GVirConfigCapabilitiesCpuModel=%p", model); - model->priv = GVIR_CONFIG_CAPABILITIES_CPU_MODEL_GET_PRIVATE(model); } diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c index d3c7997..1ff879a 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c @@ -44,8 +44,6 @@ static void gvir_config_capabilities_cpu_topology_class_init(GVirConfigCapabilit static void gvir_config_capabilities_cpu_topology_init(GVirConfigCapabilitiesCpuTopology *topology) { - g_debug("Init GVirConfigCapabilitiesCpuTopology=%p", topology); - topology->priv = GVIR_CONFIG_CAPABILITIES_CPU_TOPOLOGY_GET_PRIVATE(topology); } diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c index 294d60e..913c759 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c @@ -49,8 +49,6 @@ static void gvir_config_capabilities_cpu_class_init(GVirConfigCapabilitiesCpuCla static void gvir_config_capabilities_cpu_init(GVirConfigCapabilitiesCpu *cpu) { - g_debug("Init GVirConfigCapabilitiesCpu=%p", cpu); - cpu->priv = GVIR_CONFIG_CAPABILITIES_CPU_GET_PRIVATE(cpu); } diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c index c08eebd..8da33dc 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c @@ -44,8 +44,6 @@ static void gvir_config_capabilities_guest_arch_class_init(GVirConfigCapabilitie static void gvir_config_capabilities_guest_arch_init(GVirConfigCapabilitiesGuestArch *arch) { - g_debug("Init GVirConfigCapabilitiesGuestArch=%p", arch); - arch->priv = GVIR_CONFIG_CAPABILITIES_GUEST_ARCH_GET_PRIVATE(arch); } diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c index 148bfc7..3162ea1 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c @@ -45,8 +45,6 @@ static void gvir_config_capabilities_guest_domain_class_init(GVirConfigCapabilit static void gvir_config_capabilities_guest_domain_init(GVirConfigCapabilitiesGuestDomain *domain) { - g_debug("Init GVirConfigCapabilitiesGuestDomain=%p", domain); - domain->priv = GVIR_CONFIG_CAPABILITIES_GUEST_DOMAIN_GET_PRIVATE(domain); } diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c index 51a0066..9e9533a 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c @@ -44,8 +44,6 @@ static void gvir_config_capabilities_guest_feature_class_init(GVirConfigCapabili static void gvir_config_capabilities_guest_feature_init(GVirConfigCapabilitiesGuestFeature *feature) { - g_debug("Init GVirConfigCapabilitiesGuestFeature=%p", feature); - feature->priv = GVIR_CONFIG_CAPABILITIES_GUEST_FEATURE_GET_PRIVATE(feature); } diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-guest.c b/libvirt-gconfig/libvirt-gconfig-capabilities-guest.c index bbc1408..128b22f 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-guest.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-guest.c @@ -45,8 +45,6 @@ static void gvir_config_capabilities_guest_class_init(GVirConfigCapabilitiesGues static void gvir_config_capabilities_guest_init(GVirConfigCapabilitiesGuest *guest) { - g_debug("Init GVirConfigCapabilitiesGuest=%p", guest); - guest->priv = GVIR_CONFIG_CAPABILITIES_GUEST_GET_PRIVATE(guest); } diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c b/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c index 9cbb585..77e0593 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c @@ -42,8 +42,6 @@ static void gvir_config_capabilities_host_secmodel_class_init(GVirConfigCapabili static void gvir_config_capabilities_host_secmodel_init(GVirConfigCapabilitiesHostSecModel *secmodel) { - g_debug("Init GVirConfigCapabilitiesHostSecModel=%p", secmodel); - secmodel->priv = GVIR_CONFIG_CAPABILITIES_HOST_SECMODEL_GET_PRIVATE(secmodel); } diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-host.c b/libvirt-gconfig/libvirt-gconfig-capabilities-host.c index a5d58e8..e26c2d0 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-host.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-host.c @@ -45,8 +45,6 @@ static void gvir_config_capabilities_host_class_init(GVirConfigCapabilitiesHostC static void gvir_config_capabilities_host_init(GVirConfigCapabilitiesHost *host) { - g_debug("Init GVirConfigCapabilitiesHost=%p", host); - host->priv = GVIR_CONFIG_CAPABILITIES_HOST_GET_PRIVATE(host); } diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities.c b/libvirt-gconfig/libvirt-gconfig-capabilities.c index 73d56f5..6cc5256 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities.c @@ -45,8 +45,6 @@ static void gvir_config_capabilities_class_init(GVirConfigCapabilitiesClass *kla static void gvir_config_capabilities_init(GVirConfigCapabilities *caps) { - g_debug("Init GVirConfigCapabilities=%p", caps); - caps->priv = GVIR_CONFIG_CAPABILITIES_GET_PRIVATE(caps); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c b/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c index 262352b..4bf94cc 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c @@ -44,8 +44,6 @@ static void gvir_config_domain_address_pci_class_init(GVirConfigDomainAddressPci static void gvir_config_domain_address_pci_init(GVirConfigDomainAddressPci *address) { - g_debug("Init GVirConfigDomainAddressPci=%p", address); - address->priv = GVIR_CONFIG_DOMAIN_ADDRESS_PCI_GET_PRIVATE(address); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c b/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c index a0a35fe..a794922 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c @@ -44,8 +44,6 @@ static void gvir_config_domain_address_usb_class_init(GVirConfigDomainAddressUsb static void gvir_config_domain_address_usb_init(GVirConfigDomainAddressUsb *address) { - g_debug("Init GVirConfigDomainAddressUsb=%p", address); - address->priv = GVIR_CONFIG_DOMAIN_ADDRESS_USB_GET_PRIVATE(address); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address.c b/libvirt-gconfig/libvirt-gconfig-domain-address.c index 57501f5..c0f6ba6 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address.c @@ -44,7 +44,5 @@ static void gvir_config_domain_address_class_init(GVirConfigDomainAddressClass * static void gvir_config_domain_address_init(GVirConfigDomainAddress *address) { - g_debug("Init GVirConfigDomainAddress=%p", address); - address->priv = GVIR_CONFIG_DOMAIN_ADDRESS_GET_PRIVATE(address); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-channel.c b/libvirt-gconfig/libvirt-gconfig-domain-channel.c index 9578bf3..20e79e3 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-channel.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-channel.c @@ -44,8 +44,6 @@ static void gvir_config_domain_channel_class_init(GVirConfigDomainChannelClass * static void gvir_config_domain_channel_init(GVirConfigDomainChannel *channel) { - g_debug("Init GVirConfigDomainChannel=%p", channel); - channel->priv = GVIR_CONFIG_DOMAIN_CHANNEL_GET_PRIVATE(channel); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c index a965417..c9fadc8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c @@ -45,8 +45,6 @@ static void gvir_config_domain_chardev_source_pty_class_init(GVirConfigDomainCha static void gvir_config_domain_chardev_source_pty_init(GVirConfigDomainChardevSourcePty *source) { - g_debug("Init GVirConfigDomainChardevSourcePty=%p", source); - source->priv = GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_PTY_GET_PRIVATE(source); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c index e867fa1..98ff221 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c @@ -42,8 +42,6 @@ static void gvir_config_domain_chardev_source_spiceport_class_init(GVirConfigDom static void gvir_config_domain_chardev_source_spiceport_init(GVirConfigDomainChardevSourceSpicePort *source) { - g_debug("Init GVirConfigDomainChardevSourceSpicePort=%p", source); - source->priv = GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_PORT_GET_PRIVATE(source); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c index 0352a6c..d0b876b 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c @@ -44,8 +44,6 @@ static void gvir_config_domain_chardev_source_spicevmc_class_init(GVirConfigDoma static void gvir_config_domain_chardev_source_spicevmc_init(GVirConfigDomainChardevSourceSpiceVmc *source) { - g_debug("Init GVirConfigDomainChardevSourceSpiceVmc=%p", source); - source->priv = GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_VMC_GET_PRIVATE(source); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c index 162b788..069340f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c @@ -45,8 +45,6 @@ static void gvir_config_domain_chardev_source_unix_class_init(GVirConfigDomainCh static void gvir_config_domain_chardev_source_unix_init(GVirConfigDomainChardevSourceUnix *source) { - g_debug("Init GVirConfigDomainChardevSourceUnix=%p", source); - source->priv = GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_UNIX_GET_PRIVATE(source); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c index bbb4c75..117dbe1 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c @@ -45,8 +45,6 @@ static void gvir_config_domain_chardev_source_class_init(GVirConfigDomainChardev static void gvir_config_domain_chardev_source_init(GVirConfigDomainChardevSource *source) { - g_debug("Init GVirConfigDomainChardevSource=%p", source); - source->priv = GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_GET_PRIVATE(source); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev.c index 9847766..fd5e4c9 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev.c @@ -44,8 +44,6 @@ static void gvir_config_domain_chardev_class_init(GVirConfigDomainChardevClass * static void gvir_config_domain_chardev_init(GVirConfigDomainChardev *chardev) { - g_debug("Init GVirConfigDomainChardev=%p", chardev); - chardev->priv = GVIR_CONFIG_DOMAIN_CHARDEV_GET_PRIVATE(chardev); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-clock.c b/libvirt-gconfig/libvirt-gconfig-domain-clock.c index 12516c7..9795565 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-clock.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-clock.c @@ -44,8 +44,6 @@ static void gvir_config_domain_clock_class_init(GVirConfigDomainClockClass *klas static void gvir_config_domain_clock_init(GVirConfigDomainClock *klock) { - g_debug("Init GVirConfigDomainClock=%p", klock); - klock->priv = GVIR_CONFIG_DOMAIN_CLOCK_GET_PRIVATE(klock); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-console.c b/libvirt-gconfig/libvirt-gconfig-domain-console.c index 20f8b9c..5192870 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-console.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-console.c @@ -44,8 +44,6 @@ static void gvir_config_domain_console_class_init(GVirConfigDomainConsoleClass * static void gvir_config_domain_console_init(GVirConfigDomainConsole *console) { - g_debug("Init GVirConfigDomainConsole=%p", console); - console->priv = GVIR_CONFIG_DOMAIN_CONSOLE_GET_PRIVATE(console); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c b/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c index c910a84..4262465 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c @@ -122,8 +122,6 @@ static void gvir_config_domain_controller_usb_class_init(GVirConfigDomainControl static void gvir_config_domain_controller_usb_init(GVirConfigDomainControllerUsb *controller_usb) { - g_debug("Init GVirConfigDomainControllerUsb=%p", controller_usb); - controller_usb->priv = GVIR_CONFIG_DOMAIN_CONTROLLER_USB_GET_PRIVATE(controller_usb); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-controller.c b/libvirt-gconfig/libvirt-gconfig-domain-controller.c index f318219..82994fe 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-controller.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-controller.c @@ -44,8 +44,6 @@ static void gvir_config_domain_controller_class_init(GVirConfigDomainControllerC static void gvir_config_domain_controller_init(GVirConfigDomainController *controller) { - g_debug("Init GVirConfigDomainController=%p", controller); - controller->priv = GVIR_CONFIG_DOMAIN_CONTROLLER_GET_PRIVATE(controller); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c b/libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c index c29a44e..dc5fa4e 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c @@ -44,8 +44,6 @@ static void gvir_config_domain_cpu_feature_class_init(GVirConfigDomainCpuFeature static void gvir_config_domain_cpu_feature_init(GVirConfigDomainCpuFeature *feature) { - g_debug("Init GVirConfigDomainCpuFeature=%p", feature); - feature->priv = GVIR_CONFIG_DOMAIN_CPU_FEATURE_GET_PRIVATE(feature); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c b/libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c index 03024a6..06a3ec8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c @@ -44,8 +44,6 @@ static void gvir_config_domain_cpu_model_class_init(GVirConfigDomainCpuModelClas static void gvir_config_domain_cpu_model_init(GVirConfigDomainCpuModel *model) { - g_debug("Init GVirConfigDomainCpuModel=%p", model); - model->priv = GVIR_CONFIG_DOMAIN_CPU_MODEL_GET_PRIVATE(model); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-cpu.c b/libvirt-gconfig/libvirt-gconfig-domain-cpu.c index 0037763..2dffae3 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-cpu.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-cpu.c @@ -52,8 +52,6 @@ static void gvir_config_domain_cpu_class_init(GVirConfigDomainCpuClass *klass) static void gvir_config_domain_cpu_init(GVirConfigDomainCpu *cpu) { - g_debug("Init GVirConfigDomainCpu=%p", cpu); - cpu->priv = GVIR_CONFIG_DOMAIN_CPU_GET_PRIVATE(cpu); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device.c b/libvirt-gconfig/libvirt-gconfig-domain-device.c index 7c97a0f..3d2b9b3 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-device.c @@ -44,8 +44,6 @@ static void gvir_config_domain_device_class_init(GVirConfigDomainDeviceClass *kl static void gvir_config_domain_device_init(GVirConfigDomainDevice *device) { - g_debug("Init GVirConfigDomainDevice=%p", device); - device->priv = GVIR_CONFIG_DOMAIN_DEVICE_GET_PRIVATE(device); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c b/libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c index ddf7ce2..fb05e18 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c @@ -44,8 +44,6 @@ static void gvir_config_domain_disk_driver_class_init(GVirConfigDomainDiskDriver static void gvir_config_domain_disk_driver_init(GVirConfigDomainDiskDriver *driver) { - g_debug("Init GVirConfigDomainDiskDriver=%p", driver); - driver->priv = GVIR_CONFIG_DOMAIN_DISK_DRIVER_GET_PRIVATE(driver); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index 85d2bea..75aaa12 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -44,8 +44,6 @@ static void gvir_config_domain_disk_class_init(GVirConfigDomainDiskClass *klass) static void gvir_config_domain_disk_init(GVirConfigDomainDisk *disk) { - g_debug("Init GVirConfigDomainDisk=%p", disk); - disk->priv = GVIR_CONFIG_DOMAIN_DISK_GET_PRIVATE(disk); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c index 97b7bd6..56c3a01 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c @@ -44,8 +44,6 @@ static void gvir_config_domain_filesys_class_init(GVirConfigDomainFilesysClass * static void gvir_config_domain_filesys_init(GVirConfigDomainFilesys *filesys) { - g_debug("Init GVirConfigDomainFilesys=%p", filesys); - filesys->priv = GVIR_CONFIG_DOMAIN_FILESYS_GET_PRIVATE(filesys); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c index a7743f6..dadf684 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c @@ -44,8 +44,6 @@ static void gvir_config_domain_graphics_desktop_class_init(GVirConfigDomainGraph static void gvir_config_domain_graphics_desktop_init(GVirConfigDomainGraphicsDesktop *graphics_desktop) { - g_debug("Init GVirConfigDomainGraphicsDesktop=%p", graphics_desktop); - graphics_desktop->priv = GVIR_CONFIG_DOMAIN_GRAPHICS_DESKTOP_GET_PRIVATE(graphics_desktop); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c index 3d8357d..7a2cb4d 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c @@ -44,8 +44,6 @@ static void gvir_config_domain_graphics_rdp_class_init(GVirConfigDomainGraphicsR static void gvir_config_domain_graphics_rdp_init(GVirConfigDomainGraphicsRdp *graphics_rdp) { - g_debug("Init GVirConfigDomainGraphicsRdp=%p", graphics_rdp); - graphics_rdp->priv = GVIR_CONFIG_DOMAIN_GRAPHICS_RDP_GET_PRIVATE(graphics_rdp); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c index 2097383..1740494 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c @@ -44,8 +44,6 @@ static void gvir_config_domain_graphics_sdl_class_init(GVirConfigDomainGraphicsS static void gvir_config_domain_graphics_sdl_init(GVirConfigDomainGraphicsSdl *graphics_sdl) { - g_debug("Init GVirConfigDomainGraphicsSdl=%p", graphics_sdl); - graphics_sdl->priv = GVIR_CONFIG_DOMAIN_GRAPHICS_SDL_GET_PRIVATE(graphics_sdl); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c index 39e1a3e..c8b45d6 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c @@ -45,8 +45,6 @@ static void gvir_config_domain_graphics_spice_class_init(GVirConfigDomainGraphic static void gvir_config_domain_graphics_spice_init(GVirConfigDomainGraphicsSpice *graphics_spice) { - g_debug("Init GVirConfigDomainGraphicsSpice=%p", graphics_spice); - graphics_spice->priv = GVIR_CONFIG_DOMAIN_GRAPHICS_SPICE_GET_PRIVATE(graphics_spice); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c index 5b3059c..fc26bb9 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c @@ -44,8 +44,6 @@ static void gvir_config_domain_graphics_vnc_class_init(GVirConfigDomainGraphicsV static void gvir_config_domain_graphics_vnc_init(GVirConfigDomainGraphicsVnc *graphics_vnc) { - g_debug("Init GVirConfigDomainGraphicsVnc=%p", graphics_vnc); - graphics_vnc->priv = GVIR_CONFIG_DOMAIN_GRAPHICS_VNC_GET_PRIVATE(graphics_vnc); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c index e42e0cc..8b06e95 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c @@ -44,8 +44,6 @@ static void gvir_config_domain_graphics_class_init(GVirConfigDomainGraphicsClass static void gvir_config_domain_graphics_init(GVirConfigDomainGraphics *graphics) { - g_debug("Init GVirConfigDomainGraphics=%p", graphics); - graphics->priv = GVIR_CONFIG_DOMAIN_GRAPHICS_GET_PRIVATE(graphics); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-input.c b/libvirt-gconfig/libvirt-gconfig-domain-input.c index e87c61c..7734c61 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-input.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-input.c @@ -44,8 +44,6 @@ static void gvir_config_domain_input_class_init(GVirConfigDomainInputClass *klas static void gvir_config_domain_input_init(GVirConfigDomainInput *device_input) { - g_debug("Init GVirConfigDomainInput=%p", device_input); - device_input->priv = GVIR_CONFIG_DOMAIN_INPUT_GET_PRIVATE(device_input); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c index c942200..a10b3c1 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c @@ -47,8 +47,6 @@ static void gvir_config_domain_interface_bridge_class_init(GVirConfigDomainInter static void gvir_config_domain_interface_bridge_init(GVirConfigDomainInterfaceBridge *bridge) { - g_debug("Init GVirConfigDomainInterfaceBridge=%p", bridge); - bridge->priv = GVIR_CONFIG_DOMAIN_INTERFACE_BRIDGE_GET_PRIVATE(bridge); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c index f11fe29..abca213 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c @@ -44,8 +44,6 @@ static void gvir_config_domain_interface_filterref_parameter_class_init(GVirConf static void gvir_config_domain_interface_filterref_parameter_init(GVirConfigDomainInterfaceFilterrefParameter *parameter) { - g_debug("Init GVirConfigDomainInterfaceFilterrefParameter=%p", parameter); - parameter->priv = GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_GET_PRIVATE(parameter); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c index 0d90173..132d9f5 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c @@ -43,8 +43,6 @@ static void gvir_config_domain_interface_filterref_class_init(GVirConfigDomainIn static void gvir_config_domain_interface_filterref_init(GVirConfigDomainInterfaceFilterref *filterref) { - g_debug("Init GVirConfigDomainInterfaceFilterref=%p", filterref); - filterref->priv = GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_GET_PRIVATE(filterref); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c index 8c0c920..27ad6ed 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c @@ -46,8 +46,6 @@ static void gvir_config_domain_interface_network_class_init(GVirConfigDomainInte static void gvir_config_domain_interface_network_init(GVirConfigDomainInterfaceNetwork *iface) { - g_debug("Init GVirConfigDomainInterfaceNetwork=%p", iface); - iface->priv = GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK_GET_PRIVATE(iface); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c index 2f844dd..d5672d6 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c @@ -46,8 +46,6 @@ static void gvir_config_domain_interface_user_class_init(GVirConfigDomainInterfa static void gvir_config_domain_interface_user_init(GVirConfigDomainInterfaceUser *iface) { - g_debug("Init GVirConfigDomainInterfaceUser=%p", iface); - iface->priv = GVIR_CONFIG_DOMAIN_INTERFACE_USER_GET_PRIVATE(iface); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c b/libvirt-gconfig/libvirt-gconfig-domain-interface.c index ce1b3f0..c5b57bd 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c @@ -46,8 +46,6 @@ static void gvir_config_domain_interface_class_init(GVirConfigDomainInterfaceCla static void gvir_config_domain_interface_init(GVirConfigDomainInterface *interface) { - g_debug("Init GVirConfigDomainInterface=%p", interface); - interface->priv = GVIR_CONFIG_DOMAIN_INTERFACE_GET_PRIVATE(interface); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c b/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c index f33d89c..c5d7768 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c @@ -44,8 +44,6 @@ static void gvir_config_domain_memballoon_class_init(GVirConfigDomainMemballoonC static void gvir_config_domain_memballoon_init(GVirConfigDomainMemballoon *memballoon) { - g_debug("Init GVirConfigDomainMemballoon=%p", memballoon); - memballoon->priv = GVIR_CONFIG_DOMAIN_MEMBALLOON_GET_PRIVATE(memballoon); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.c b/libvirt-gconfig/libvirt-gconfig-domain-os.c index 429f75a..9a00ef4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.c @@ -44,8 +44,6 @@ static void gvir_config_domain_os_class_init(GVirConfigDomainOsClass *klass) static void gvir_config_domain_os_init(GVirConfigDomainOs *os) { - g_debug("Init GVirConfigDomainOs=%p", os); - os->priv = GVIR_CONFIG_DOMAIN_OS_GET_PRIVATE(os); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-parallel.c b/libvirt-gconfig/libvirt-gconfig-domain-parallel.c index a31e755..f48d1b6 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-parallel.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-parallel.c @@ -43,8 +43,6 @@ static void gvir_config_domain_parallel_class_init(GVirConfigDomainParallelClass static void gvir_config_domain_parallel_init(GVirConfigDomainParallel *parallel) { - g_debug("Init GVirConfigDomainParallel=%p", parallel); - parallel->priv = GVIR_CONFIG_DOMAIN_PARALLEL_GET_PRIVATE(parallel); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-power-management.c b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c index 0306170..c070a0f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-power-management.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c @@ -52,8 +52,6 @@ static void gvir_config_domain_power_management_class_init static void gvir_config_domain_power_management_init(GVirConfigDomainPowerManagement *pm) { - g_debug("Init GVirConfigDomainPowerManagement=%p", pm); - pm->priv = GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_GET_PRIVATE(pm); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-redirdev.c b/libvirt-gconfig/libvirt-gconfig-domain-redirdev.c index 7260f4f..5fd4dda 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-redirdev.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-redirdev.c @@ -44,8 +44,6 @@ static void gvir_config_domain_redirdev_class_init(GVirConfigDomainRedirdevClass static void gvir_config_domain_redirdev_init(GVirConfigDomainRedirdev *redirdev) { - g_debug("Init GVirConfigDomainRedirdev=%p", redirdev); - redirdev->priv = GVIR_CONFIG_DOMAIN_REDIRDEV_GET_PRIVATE(redirdev); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c index 032672a..77d8aa0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c @@ -44,8 +44,6 @@ static void gvir_config_domain_seclabel_class_init(GVirConfigDomainSeclabelClass static void gvir_config_domain_seclabel_init(GVirConfigDomainSeclabel *seclabel) { - g_debug("Init GVirConfigDomainSeclabel=%p", seclabel); - seclabel->priv = GVIR_CONFIG_DOMAIN_SECLABEL_GET_PRIVATE(seclabel); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-serial.c b/libvirt-gconfig/libvirt-gconfig-domain-serial.c index a3f7e6d..84adb2a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-serial.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-serial.c @@ -43,8 +43,6 @@ static void gvir_config_domain_serial_class_init(GVirConfigDomainSerialClass *kl static void gvir_config_domain_serial_init(GVirConfigDomainSerial *serial) { - g_debug("Init GVirConfigDomainSerial=%p", serial); - serial->priv = GVIR_CONFIG_DOMAIN_SERIAL_GET_PRIVATE(serial); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c index 873d16c..ab5abc4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c @@ -44,8 +44,6 @@ static void gvir_config_domain_smartcard_host_certificates_class_init(GVirConfig static void gvir_config_domain_smartcard_host_certificates_init(GVirConfigDomainSmartcardHostCertificates *smartcard) { - g_debug("Init GVirConfigDomainSmartcardHostCertificates=%p", smartcard); - smartcard->priv = GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_CERTIFICATES_GET_PRIVATE(smartcard); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c index 437f2c8..b29e07b 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c @@ -44,8 +44,6 @@ static void gvir_config_domain_smartcard_host_class_init(GVirConfigDomainSmartca static void gvir_config_domain_smartcard_host_init(GVirConfigDomainSmartcardHost *smartcard) { - g_debug("Init GVirConfigDomainSmartcardHost=%p", smartcard); - smartcard->priv = GVIR_CONFIG_DOMAIN_SMARTCARD_HOST_GET_PRIVATE(smartcard); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c index 50f84e3..830faa4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c @@ -44,8 +44,6 @@ static void gvir_config_domain_smartcard_passthrough_class_init(GVirConfigDomain static void gvir_config_domain_smartcard_passthrough_init(GVirConfigDomainSmartcardPassthrough *smartcard) { - g_debug("Init GVirConfigDomainSmartcardPassthrough=%p", smartcard); - smartcard->priv = GVIR_CONFIG_DOMAIN_SMARTCARD_PASSTHROUGH_GET_PRIVATE(smartcard); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c index d5316c0..7900c1a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c @@ -44,8 +44,6 @@ static void gvir_config_domain_smartcard_class_init(GVirConfigDomainSmartcardCla static void gvir_config_domain_smartcard_init(GVirConfigDomainSmartcard *smartcard) { - g_debug("Init GVirConfigDomainSmartcard=%p", smartcard); - smartcard->priv = GVIR_CONFIG_DOMAIN_SMARTCARD_GET_PRIVATE(smartcard); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c index 3907bbb..ba7a40e 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c @@ -45,8 +45,6 @@ static void gvir_config_domain_snapshot_disk_class_init(GVirConfigDomainSnapshot static void gvir_config_domain_snapshot_disk_init(GVirConfigDomainSnapshotDisk *disk) { - g_debug("Init GVirConfigDomainSnapshotDisk=%p", disk); - disk->priv = GVIR_CONFIG_DOMAIN_SNAPSHOT_DISK_GET_PRIVATE(disk); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c index fc9a130..69b7df7 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c @@ -46,8 +46,6 @@ static void gvir_config_domain_snapshot_class_init(GVirConfigDomainSnapshotClass static void gvir_config_domain_snapshot_init(GVirConfigDomainSnapshot *snapshot) { - g_debug("Init GVirConfigDomainSnapshot=%p", snapshot); - snapshot->priv = GVIR_CONFIG_DOMAIN_SNAPSHOT_GET_PRIVATE(snapshot); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-sound.c b/libvirt-gconfig/libvirt-gconfig-domain-sound.c index a1f5749..7ce71bd 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-sound.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-sound.c @@ -44,8 +44,6 @@ static void gvir_config_domain_sound_class_init(GVirConfigDomainSoundClass *klas static void gvir_config_domain_sound_init(GVirConfigDomainSound *sound) { - g_debug("Init GVirConfigDomainSound=%p", sound); - sound->priv = GVIR_CONFIG_DOMAIN_SOUND_GET_PRIVATE(sound); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c b/libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c index 1734428..ba74a28 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c @@ -44,8 +44,6 @@ static void gvir_config_domain_timer_hpet_class_init(GVirConfigDomainTimerHpetCl static void gvir_config_domain_timer_hpet_init(GVirConfigDomainTimerHpet *timer) { - g_debug("Init GVirConfigDomainTimerHpet=%p", timer); - timer->priv = GVIR_CONFIG_DOMAIN_TIMER_HPET_GET_PRIVATE(timer); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c b/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c index 975b372..af979b2 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c @@ -44,8 +44,6 @@ static void gvir_config_domain_timer_pit_class_init(GVirConfigDomainTimerPitClas static void gvir_config_domain_timer_pit_init(GVirConfigDomainTimerPit *timer) { - g_debug("Init GVirConfigDomainTimerPit=%p", timer); - timer->priv = GVIR_CONFIG_DOMAIN_TIMER_PIT_GET_PRIVATE(timer); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c b/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c index 1ae0542..0adcc66 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c @@ -44,8 +44,6 @@ static void gvir_config_domain_timer_rtc_class_init(GVirConfigDomainTimerRtcClas static void gvir_config_domain_timer_rtc_init(GVirConfigDomainTimerRtc *timer) { - g_debug("Init GVirConfigDomainTimerRtc=%p", timer); - timer->priv = GVIR_CONFIG_DOMAIN_TIMER_RTC_GET_PRIVATE(timer); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer.c b/libvirt-gconfig/libvirt-gconfig-domain-timer.c index 2d778dd..e89e111 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer.c @@ -44,8 +44,6 @@ static void gvir_config_domain_timer_class_init(GVirConfigDomainTimerClass *klas static void gvir_config_domain_timer_init(GVirConfigDomainTimer *timer) { - g_debug("Init GVirConfigDomainTimer=%p", timer); - timer->priv = GVIR_CONFIG_DOMAIN_TIMER_GET_PRIVATE(timer); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-video.c b/libvirt-gconfig/libvirt-gconfig-domain-video.c index 0330e9d..ba03c5a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-video.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-video.c @@ -45,8 +45,6 @@ static void gvir_config_domain_video_class_init(GVirConfigDomainVideoClass *klas static void gvir_config_domain_video_init(GVirConfigDomainVideo *video) { - g_debug("Init GVirConfigDomainVideo=%p", video); - video->priv = GVIR_CONFIG_DOMAIN_VIDEO_GET_PRIVATE(video); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 8a6c676..de84fd4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -205,8 +205,6 @@ static void gvir_config_domain_class_init(GVirConfigDomainClass *klass) static void gvir_config_domain_init(GVirConfigDomain *domain) { - g_debug("Init GVirConfigDomain=%p", domain); - domain->priv = GVIR_CONFIG_DOMAIN_GET_PRIVATE(domain); } diff --git a/libvirt-gconfig/libvirt-gconfig-interface.c b/libvirt-gconfig/libvirt-gconfig-interface.c index 521455c..6c81325 100644 --- a/libvirt-gconfig/libvirt-gconfig-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-interface.c @@ -44,8 +44,6 @@ static void gvir_config_interface_class_init(GVirConfigInterfaceClass *klass) static void gvir_config_interface_init(GVirConfigInterface *iface) { - g_debug("Init GVirConfigInterface=%p", iface); - iface->priv = GVIR_CONFIG_INTERFACE_GET_PRIVATE(iface); } diff --git a/libvirt-gconfig/libvirt-gconfig-network-filter.c b/libvirt-gconfig/libvirt-gconfig-network-filter.c index 68c5c79..eddf05c 100644 --- a/libvirt-gconfig/libvirt-gconfig-network-filter.c +++ b/libvirt-gconfig/libvirt-gconfig-network-filter.c @@ -44,8 +44,6 @@ static void gvir_config_network_filter_class_init(GVirConfigNetworkFilterClass * static void gvir_config_network_filter_init(GVirConfigNetworkFilter *filter) { - g_debug("Init GVirConfigNetworkFilter=%p", filter); - filter->priv = GVIR_CONFIG_NETWORK_FILTER_GET_PRIVATE(filter); } diff --git a/libvirt-gconfig/libvirt-gconfig-network.c b/libvirt-gconfig/libvirt-gconfig-network.c index e14b9c7..963d056 100644 --- a/libvirt-gconfig/libvirt-gconfig-network.c +++ b/libvirt-gconfig/libvirt-gconfig-network.c @@ -44,8 +44,6 @@ static void gvir_config_network_class_init(GVirConfigNetworkClass *klass) static void gvir_config_network_init(GVirConfigNetwork *network) { - g_debug("Init GVirConfigNetwork=%p", network); - network->priv = GVIR_CONFIG_NETWORK_GET_PRIVATE(network); } diff --git a/libvirt-gconfig/libvirt-gconfig-node-device.c b/libvirt-gconfig/libvirt-gconfig-node-device.c index eab4aab..b89690f 100644 --- a/libvirt-gconfig/libvirt-gconfig-node-device.c +++ b/libvirt-gconfig/libvirt-gconfig-node-device.c @@ -44,8 +44,6 @@ static void gvir_config_node_device_class_init(GVirConfigNodeDeviceClass *klass) static void gvir_config_node_device_init(GVirConfigNodeDevice *device) { - g_debug("Init GVirConfigNodeDevice=%p", device); - device->priv = GVIR_CONFIG_NODE_DEVICE_GET_PRIVATE(device); } diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 5557165..bf328f3 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -123,8 +123,6 @@ static void gvir_config_object_finalize(GObject *object) GVirConfigObject *gvir_object = GVIR_CONFIG_OBJECT(object); GVirConfigObjectPrivate *priv = gvir_object->priv; - g_debug("Finalize GVirConfigObject=%p", gvir_object); - g_free(priv->schema); if (priv->doc != NULL) { @@ -184,8 +182,6 @@ static void gvir_config_object_class_init(GVirConfigObjectClass *klass) static void gvir_config_object_init(GVirConfigObject *object) { - g_debug("Init GVirConfigObject=%p", object); - object->priv = GVIR_CONFIG_OBJECT_GET_PRIVATE(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-secret.c b/libvirt-gconfig/libvirt-gconfig-secret.c index c2dbcff..73a3fc3 100644 --- a/libvirt-gconfig/libvirt-gconfig-secret.c +++ b/libvirt-gconfig/libvirt-gconfig-secret.c @@ -44,8 +44,6 @@ static void gvir_config_secret_class_init(GVirConfigSecretClass *klass) static void gvir_config_secret_init(GVirConfigSecret *secret) { - g_debug("Init GVirConfigSecret=%p", secret); - secret->priv = GVIR_CONFIG_SECRET_GET_PRIVATE(secret); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-permissions.c b/libvirt-gconfig/libvirt-gconfig-storage-permissions.c index 066ee11..79c3b9e 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-permissions.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-permissions.c @@ -44,8 +44,6 @@ static void gvir_config_storage_permissions_class_init(GVirConfigStoragePermissi static void gvir_config_storage_permissions_init(GVirConfigStoragePermissions *perms) { - g_debug("Init GVirConfigStoragePermissions=%p", perms); - perms->priv = GVIR_CONFIG_STORAGE_PERMISSIONS_GET_PRIVATE(perms); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c b/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c index ad8b28d..07af50b 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c @@ -45,8 +45,6 @@ static void gvir_config_storage_pool_source_class_init(GVirConfigStoragePoolSour static void gvir_config_storage_pool_source_init(GVirConfigStoragePoolSource *source) { - g_debug("Init GVirConfigStoragePoolSource=%p", source); - source->priv = GVIR_CONFIG_STORAGE_POOL_SOURCE_GET_PRIVATE(source); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c b/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c index f76b26c..72ea21d 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c @@ -45,8 +45,6 @@ static void gvir_config_storage_pool_target_class_init(GVirConfigStoragePoolTarg static void gvir_config_storage_pool_target_init(GVirConfigStoragePoolTarget *target) { - g_debug("Init GVirConfigStoragePoolTarget=%p", target); - target->priv = GVIR_CONFIG_STORAGE_POOL_TARGET_GET_PRIVATE(target); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.c b/libvirt-gconfig/libvirt-gconfig-storage-pool.c index 87caeb6..0c7940d 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.c @@ -46,8 +46,6 @@ static void gvir_config_storage_pool_class_init(GVirConfigStoragePoolClass *klas static void gvir_config_storage_pool_init(GVirConfigStoragePool *pool) { - g_debug("Init GVirConfigStoragePool=%p", pool); - pool->priv = GVIR_CONFIG_STORAGE_POOL_GET_PRIVATE(pool); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c b/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c index 9fa648d..14a0e22 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c @@ -45,8 +45,6 @@ static void gvir_config_storage_vol_backing_store_class_init(GVirConfigStorageVo static void gvir_config_storage_vol_backing_store_init(GVirConfigStorageVolBackingStore *backing_store) { - g_debug("Init GVirConfigStorageVolBackingStore=%p", backing_store); - backing_store->priv = GVIR_CONFIG_STORAGE_VOL_BACKING_STORE_GET_PRIVATE(backing_store); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c index b72b304..cf4c0c7 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c @@ -45,8 +45,6 @@ static void gvir_config_storage_vol_target_class_init(GVirConfigStorageVolTarget static void gvir_config_storage_vol_target_init(GVirConfigStorageVolTarget *target) { - g_debug("Init GVirConfigStorageVolTarget=%p", target); - target->priv = GVIR_CONFIG_STORAGE_VOL_TARGET_GET_PRIVATE(target); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol.c b/libvirt-gconfig/libvirt-gconfig-storage-vol.c index 6690dd7..2dade7e 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol.c @@ -46,8 +46,6 @@ static void gvir_config_storage_vol_class_init(GVirConfigStorageVolClass *klass) static void gvir_config_storage_vol_init(GVirConfigStorageVol *vol) { - g_debug("Init GVirConfigStorageVol=%p", vol); - vol->priv = GVIR_CONFIG_STORAGE_VOL_GET_PRIVATE(vol); } diff --git a/libvirt-gconfig/libvirt-gconfig-xml-doc.c b/libvirt-gconfig/libvirt-gconfig-xml-doc.c index d7a5ea9..d17da21 100644 --- a/libvirt-gconfig/libvirt-gconfig-xml-doc.c +++ b/libvirt-gconfig/libvirt-gconfig-xml-doc.c @@ -81,8 +81,6 @@ static void gvir_config_xml_doc_finalize(GObject *object) GVirConfigXmlDoc *doc = GVIR_CONFIG_XML_DOC(object); GVirConfigXmlDocPrivate *priv = doc->priv; - g_debug("Finalize GVirConfigXmlDoc=%p", doc); - xmlFreeDoc(priv->doc); G_OBJECT_CLASS(gvir_config_xml_doc_parent_class)->finalize(object); @@ -113,8 +111,6 @@ static void gvir_config_xml_doc_init(GVirConfigXmlDoc *xml_doc) { GVirConfigXmlDocPrivate *priv; - g_debug("Init GVirConfigXmlDoc=%p", xml_doc); - priv = xml_doc->priv = GVIR_CONFIG_XML_DOC_GET_PRIVATE(xml_doc); memset(priv, 0, sizeof(*priv)); diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 9e7bb68..61ae364 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -143,8 +143,6 @@ static void gvir_connection_finalize(GObject *object) GVirConnection *conn = GVIR_CONNECTION(object); GVirConnectionPrivate *priv = conn->priv; - g_debug("Finalize GVirConnection=%p", conn); - if (gvir_connection_is_open(conn)) gvir_connection_close(conn); @@ -241,8 +239,6 @@ static void gvir_connection_init(GVirConnection *conn) { GVirConnectionPrivate *priv; - g_debug("Init GVirConnection=%p", conn); - priv = conn->priv = GVIR_CONNECTION_GET_PRIVATE(conn); priv->lock = g_mutex_new(); diff --git a/libvirt-gobject/libvirt-gobject-domain-device.c b/libvirt-gobject/libvirt-gobject-domain-device.c index cfb849a..8986e44 100644 --- a/libvirt-gobject/libvirt-gobject-domain-device.c +++ b/libvirt-gobject/libvirt-gobject-domain-device.c @@ -101,8 +101,6 @@ static void gvir_domain_device_finalize(GObject *object) GVirDomainDevice *self = GVIR_DOMAIN_DEVICE(object); GVirDomainDevicePrivate *priv = self->priv; - g_debug("Finalize GVirDomainDevice=%p", self); - g_clear_object(&priv->domain); g_clear_object(&priv->config); @@ -142,8 +140,6 @@ static void gvir_domain_device_class_init(GVirDomainDeviceClass *klass) static void gvir_domain_device_init(GVirDomainDevice *self) { - g_debug("Init GVirDomainDevice=%p", self); - self->priv = GVIR_DOMAIN_DEVICE_GET_PRIVATE(self); } diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index f276c4a..770acff 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -53,8 +53,6 @@ static void gvir_domain_disk_finalize(GObject *object) { GVirDomainDisk *self = GVIR_DOMAIN_DISK(object); - g_debug("Finalize GVirDomainDisk=%p", self); - G_OBJECT_CLASS(gvir_domain_disk_parent_class)->finalize(object); } @@ -68,8 +66,6 @@ static void gvir_domain_disk_class_init(GVirDomainDiskClass *klass) static void gvir_domain_disk_init(GVirDomainDisk *self) { - g_debug("Init GVirDomainDisk=%p", self); - self->priv = GVIR_DOMAIN_DISK_GET_PRIVATE(self); } diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index d8ad359..57896fd 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -53,8 +53,6 @@ static void gvir_domain_interface_finalize(GObject *object) { GVirDomainInterface *self = GVIR_DOMAIN_INTERFACE(object); - g_debug("Finalize GVirDomainInterface=%p", self); - G_OBJECT_CLASS(gvir_domain_interface_parent_class)->finalize(object); } @@ -68,8 +66,6 @@ static void gvir_domain_interface_class_init(GVirDomainInterfaceClass *klass) static void gvir_domain_interface_init(GVirDomainInterface *self) { - g_debug("Init GVirDomainInterface=%p", self); - self->priv = GVIR_DOMAIN_INTERFACE_GET_PRIVATE(self); } diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index 8e71612..2a4338b 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -101,8 +101,6 @@ static void gvir_domain_snapshot_finalize(GObject *object) GVirDomainSnapshot *snapshot = GVIR_DOMAIN_SNAPSHOT(object); GVirDomainSnapshotPrivate *priv = snapshot->priv; - g_debug("Finalize GVirDomainSnapshot=%p", snapshot); - virDomainSnapshotFree(priv->handle); G_OBJECT_CLASS(gvir_domain_snapshot_parent_class)->finalize(object); @@ -134,8 +132,6 @@ static void gvir_domain_snapshot_class_init(GVirDomainSnapshotClass *klass) static void gvir_domain_snapshot_init(GVirDomainSnapshot *snapshot) { - g_debug("Init GVirDomainSnapshot=%p", snapshot); - snapshot->priv = GVIR_DOMAIN_SNAPSHOT_GET_PRIVATE(snapshot); } diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index c768cd3..7bb3b13 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -135,8 +135,6 @@ static void gvir_domain_finalize(GObject *object) GVirDomain *domain = GVIR_DOMAIN(object); GVirDomainPrivate *priv = domain->priv; - g_debug("Finalize GVirDomain=%p", domain); - if (priv->snapshots) { g_hash_table_unref(priv->snapshots); } @@ -255,8 +253,6 @@ static void gvir_domain_class_init(GVirDomainClass *klass) static void gvir_domain_init(GVirDomain *domain) { - g_debug("Init GVirDomain=%p", domain); - domain->priv = GVIR_DOMAIN_GET_PRIVATE(domain); domain->priv->lock = g_mutex_new(); } diff --git a/libvirt-gobject/libvirt-gobject-input-stream.c b/libvirt-gobject/libvirt-gobject-input-stream.c index 58e3037..788e16e 100644 --- a/libvirt-gobject/libvirt-gobject-input-stream.c +++ b/libvirt-gobject/libvirt-gobject-input-stream.c @@ -88,7 +88,6 @@ static void gvir_input_stream_finalize(GObject *object) { GVirInputStream *stream = GVIR_INPUT_STREAM(object); - g_debug("Finalize input stream GVirStream=%p", stream->priv->stream); stream->priv->stream = NULL; // unowned if (G_OBJECT_CLASS(gvir_input_stream_parent_class)->finalize) diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index 6b2df59..ed7421f 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -101,8 +101,6 @@ static void gvir_interface_finalize(GObject *object) GVirInterface *iface = GVIR_INTERFACE(object); GVirInterfacePrivate *priv = iface->priv; - g_debug("Finalize GVirInterface=%p", iface); - virInterfaceFree(priv->handle); G_OBJECT_CLASS(gvir_interface_parent_class)->finalize(object); @@ -134,8 +132,6 @@ static void gvir_interface_class_init(GVirInterfaceClass *klass) static void gvir_interface_init(GVirInterface *iface) { - g_debug("Init GVirInterface=%p", iface); - iface->priv = GVIR_INTERFACE_GET_PRIVATE(iface); } diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index e20343e..bbd5f84 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -63,8 +63,6 @@ static void gvir_manager_finalize(GObject *object) GVirManager *man = GVIR_MANAGER(object); GVirManagerPrivate *priv = man->priv; - g_debug("Finalize GVirManager=%p", man); - GList *tmp = priv->connections; while (tmp) { GVirConnection *conn = tmp->data; @@ -112,8 +110,6 @@ static void gvir_manager_init(GVirManager *manager) { GVirManagerPrivate *priv; - g_debug("Init GVirManager=%p", manager); - priv = manager->priv = GVIR_MANAGER_GET_PRIVATE(manager); priv->lock = g_mutex_new(); diff --git a/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c b/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c index 90a402b..7d1c979 100644 --- a/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c +++ b/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c @@ -101,8 +101,6 @@ static void gvir_network_dhcp_lease_finalize(GObject *object) GVirNetworkDHCPLeasePrivate *priv = lease->priv; #endif /* HAVE_VIR_NETWORK_GET_DHCP_LEASES */ - g_debug("Finalize GVirNetworkDHCPLease=%p", lease); - #ifdef HAVE_VIR_NETWORK_GET_DHCP_LEASES virNetworkDHCPLeaseFree(priv->handle); #endif /* HAVE_VIR_NETWORK_GET_DHCP_LEASES */ @@ -134,8 +132,6 @@ static void gvir_network_dhcp_lease_class_init(GVirNetworkDHCPLeaseClass *klass) static void gvir_network_dhcp_lease_init(GVirNetworkDHCPLease *lease) { - g_debug("Init GVirNetworkDHCPLease=%p", lease); - lease->priv = GVIR_NETWORK_DHCP_LEASE_GET_PRIVATE(lease); } diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index 60756c0..7c5d6c0 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -102,8 +102,6 @@ static void gvir_network_filter_finalize(GObject *object) GVirNetworkFilter *nf = GVIR_NETWORK_FILTER(object); GVirNetworkFilterPrivate *priv = nf->priv; - g_debug("Finalize GVirNetworkFilter=%p", nf); - virNWFilterFree(priv->handle); G_OBJECT_CLASS(gvir_network_filter_parent_class)->finalize(object); @@ -150,8 +148,6 @@ static void gvir_network_filter_class_init(GVirNetworkFilterClass *klass) static void gvir_network_filter_init(GVirNetworkFilter *filter) { - g_debug("Init GVirNetworkFilter=%p", filter); - filter->priv = GVIR_NETWORK_FILTER_GET_PRIVATE(filter); } diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index e666f45..0dd80a5 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -105,8 +105,6 @@ static void gvir_network_finalize(GObject *object) GVirNetwork *network = GVIR_NETWORK(object); GVirNetworkPrivate *priv = network->priv; - g_debug("Finalize GVirNetwork=%p", network); - virNetworkFree(priv->handle); G_OBJECT_CLASS(gvir_network_parent_class)->finalize(object); @@ -150,8 +148,6 @@ static void gvir_network_class_init(GVirNetworkClass *klass) static void gvir_network_init(GVirNetwork *network) { - g_debug("Init GVirNetwork=%p", network); - network->priv = GVIR_NETWORK_GET_PRIVATE(network); } diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index 18394d1..b7b7c9e 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -101,8 +101,6 @@ static void gvir_node_device_finalize(GObject *object) GVirNodeDevice *device = GVIR_NODE_DEVICE(object); GVirNodeDevicePrivate *priv = device->priv; - g_debug("Finalize GVirNodeDevice=%p", device); - virNodeDeviceFree(priv->handle); G_OBJECT_CLASS(gvir_node_device_parent_class)->finalize(object); @@ -134,8 +132,6 @@ static void gvir_node_device_class_init(GVirNodeDeviceClass *klass) static void gvir_node_device_init(GVirNodeDevice *device) { - g_debug("Init GVirNodeDevice=%p", device); - device->priv = GVIR_NODE_DEVICE_GET_PRIVATE(device); } diff --git a/libvirt-gobject/libvirt-gobject-output-stream.c b/libvirt-gobject/libvirt-gobject-output-stream.c index 463b691..97feb80 100644 --- a/libvirt-gobject/libvirt-gobject-output-stream.c +++ b/libvirt-gobject/libvirt-gobject-output-stream.c @@ -88,7 +88,6 @@ static void gvir_output_stream_finalize(GObject *object) { GVirOutputStream *stream = GVIR_OUTPUT_STREAM(object); - g_debug("Finalize output stream GVirStream=%p", stream->priv->stream); stream->priv->stream = NULL; // unowned if (G_OBJECT_CLASS(gvir_output_stream_parent_class)->finalize) diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index f03b44c..bf15931 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -102,8 +102,6 @@ static void gvir_secret_finalize(GObject *object) GVirSecret *secret = GVIR_SECRET(object); GVirSecretPrivate *priv = secret->priv; - g_debug("Finalize GVirSecret=%p", secret); - virSecretFree(priv->handle); G_OBJECT_CLASS(gvir_secret_parent_class)->finalize(object); @@ -149,8 +147,6 @@ static void gvir_secret_class_init(GVirSecretClass *klass) static void gvir_secret_init(GVirSecret *secret) { - g_debug("Init GVirSecret=%p", secret); - secret->priv = GVIR_SECRET_GET_PRIVATE(secret); } diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 5f97691..227bf23 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -106,8 +106,6 @@ static void gvir_storage_pool_finalize(GObject *object) GVirStoragePool *pool = GVIR_STORAGE_POOL(object); GVirStoragePoolPrivate *priv = pool->priv; - g_debug("Finalize GVirStoragePool=%p", pool); - if (priv->volumes) { g_hash_table_unref(priv->volumes); priv->volumes = NULL; @@ -163,8 +161,6 @@ static void gvir_storage_pool_init(GVirStoragePool *pool) { GVirStoragePoolPrivate *priv; - g_debug("Init GVirStoragePool=%p", pool); - priv = pool->priv = GVIR_STORAGE_POOL_GET_PRIVATE(pool); priv->lock = g_mutex_new(); diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 54bb0c2..18aa8b3 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -112,8 +112,6 @@ static void gvir_storage_vol_finalize(GObject *object) GVirStorageVol *vol = GVIR_STORAGE_VOL(object); GVirStorageVolPrivate *priv = vol->priv; - g_debug("Finalize GVirStorageVol=%p", vol); - virStorageVolFree(priv->handle); G_OBJECT_CLASS(gvir_storage_vol_parent_class)->finalize(object); @@ -156,8 +154,6 @@ static void gvir_storage_vol_class_init(GVirStorageVolClass *klass) static void gvir_storage_vol_init(GVirStorageVol *vol) { - g_debug("Init GVirStorageVol=%p", vol); - vol->priv = GVIR_STORAGE_VOL_GET_PRIVATE(vol); } diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 00b58be..03a0308 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -228,8 +228,6 @@ static void gvir_stream_finalize(GObject *object) GVirStreamPrivate *priv = self->priv; GList *tmp; - g_debug("Finalize GVirStream=%p", self); - if (self->priv->input_stream) g_object_unref(self->priv->input_stream); -- 2.5.0

2 1

[libvirt] [PATCH 0/3] virsh: error reporting for empty string parameters
by Ján Tomko 03 Dec '15

03 Dec '15

https://bugzilla.redhat.com/show_bug.cgi?id=1281707 Ján Tomko (3): virsh: report errors for empty strings virsh: remove custom error for cpulist from cmdIOThreadPin virsh: rename vshCommandOptString to vshCommandOptStringQuiet tools/virsh-domain-monitor.c | 4 ++-- tools/virsh-domain.c | 34 ++++++++++++++++------------------ tools/virsh-network.c | 4 ++-- tools/virsh-nodedev.c | 4 ++-- tools/virsh-volume.c | 2 +- tools/vsh.c | 12 ++++++------ tools/vsh.h | 4 ++-- 7 files changed, 31 insertions(+), 33 deletions(-) -- 2.4.6

2 4

[libvirt] [PATCH] bridge: check for invalid MAC in networkGetDHCPLeases
by Ján Tomko 03 Dec '15

03 Dec '15

Instead of comparing garbage strings against real MAC addresses, introduce an error mesage for unparsable ones: $ virsh net-dhcp-leases default --mac t12 error: Failed to get leases info for default error: invalid MAC address: t12 https://bugzilla.redhat.com/show_bug.cgi?id=1261432 --- src/network/bridge_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a0f6494..362e294 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3648,9 +3648,16 @@ networkGetDHCPLeases(virNetworkPtr network, virNetworkDHCPLeasePtr lease = NULL; virNetworkDHCPLeasePtr *leases_ret = NULL; virNetworkObjPtr obj; + virMacAddr mac_addr; virCheckFlags(0, -1); + /* only to check if the MAC is valid */ + if (mac && virMacAddrParse(mac, &mac_addr) < 0) { + virReportError(VIR_ERR_INVALID_MAC, "%s", mac); + return -1; + } + if (!(obj = networkObjFromNetwork(network))) return -1; -- 2.4.6

2 1

[libvirt] [PATCH] libxl: add support for mounts in HVM guests
by Cédric Bosdonnat 03 Dec '15

03 Dec '15

Xen HVM guests are running a QEMU, libxl allows passing QEMU parameters in the d_config.b_info.extra list. Take advantage of that to implement support for 9pfs mounts. For this to work, xen's qemu needs to be built with virtfs enabled, or an upstream qemu needs to be used. --- Note that two functions have been picked from the qemu driver's code. src/libxl/libxl_conf.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 4eed5ca..4437e8f 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -55,6 +55,7 @@ VIR_LOG_INIT("libxl.libxl_conf"); /* see xen-unstable.hg/xen/include/asm-x86/cpufeature.h */ #define LIBXL_X86_FEATURE_PAE_MASK 0x40 +#define LIBXL_FSDEV_HOST_PREFIX "fsdev-" struct guest_arch { virArch arch; @@ -84,6 +85,15 @@ static int libxlConfigOnceInit(void) VIR_ONCE_GLOBAL_INIT(libxlConfig) +VIR_ENUM_DECL(libxlDomainFSDriver) +VIR_ENUM_IMPL(libxlDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, + "local", + "local", + "handle", + NULL, + NULL, + NULL); + static void libxlDriverConfigDispose(void *obj) { @@ -1854,6 +1864,167 @@ libxlMakeCapabilities(libxl_ctx *ctx) return NULL; } +static char * +libxlBuildQemuFSStr(virDomainFSDefPtr fs) +{ + virBuffer opt = VIR_BUFFER_INITIALIZER; + const char *driver = libxlDomainFSDriverTypeToString(fs->fsdriver); + const char *wrpolicy = virDomainFSWrpolicyTypeToString(fs->wrpolicy); + + if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("only supports mount filesystem type")); + goto error; + } + + if (!driver) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Filesystem driver type not supported")); + goto error; + } + virBufferAdd(&opt, driver, -1); + + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PATH || + fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT) { + if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_MAPPED) { + virBufferAddLit(&opt, ",security_model=mapped"); + } else if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { + virBufferAddLit(&opt, ",security_model=passthrough"); + } else if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_SQUASH) { + virBufferAddLit(&opt, ",security_model=none"); + } + } else { + /* For other fs drivers, default(passthru) should always + * be supported */ + if (fs->accessmode != VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("only supports passthrough accessmode")); + goto error; + } + } + + if (fs->wrpolicy) + virBufferAsprintf(&opt, ",writeout=%s", wrpolicy); + + virBufferAsprintf(&opt, ",id=%s%s", LIBXL_FSDEV_HOST_PREFIX, fs->info.alias); + virBufferAsprintf(&opt, ",path=%s", fs->src); + + if (fs->readonly) + virBufferAddLit(&opt, ",readonly"); + + if (virBufferCheckError(&opt) < 0) + goto error; + + return virBufferContentAndReset(&opt); + + error: + virBufferFreeAndReset(&opt); + return NULL; +} + + +static char * +libxlBuildQemuFSDevStr(virDomainFSDefPtr fs) +{ + virBuffer opt = VIR_BUFFER_INITIALIZER; + + if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("can only passthrough directories")); + goto error; + } + + if (fs->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) + virBufferAddLit(&opt, "virtio-9p-ccw"); + else + virBufferAddLit(&opt, "virtio-9p-pci"); + + virBufferAsprintf(&opt, ",id=%s", fs->info.alias); + virBufferAsprintf(&opt, ",fsdev=%s%s", LIBXL_FSDEV_HOST_PREFIX, fs->info.alias); + virBufferAsprintf(&opt, ",mount_tag=%s", fs->dst); + + if (virBufferCheckError(&opt) < 0) + goto error; + + return virBufferContentAndReset(&opt); + + error: + virBufferFreeAndReset(&opt); + return NULL; +} + +static int +libxlMakeMountList(virDomainDefPtr def, + libxl_domain_config *d_config) +{ + int ret = -1; + size_t i; + size_t nextra = 0; + char *fsstr = NULL; + char *fsdevstr = NULL; + char *fsdevargstr = NULL; + char *deviceargstr = NULL; + + if (def->nfss > 0 && def->os.type != VIR_DOMAIN_OSTYPE_HVM) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("only HVM guests supports mounts")); + return ret; + } + + /* Make sure we have an allocated array, not ending with NULL */ + if (!d_config->b_info.extra) { + if (VIR_ALLOC(d_config->b_info.extra) < 0) + return ret; + nextra = 0; + } else { + nextra = virStringListLength(d_config->b_info.extra) + 1; + if (VIR_DELETE_ELEMENT(d_config->b_info.extra, nextra, nextra) < 0) + return ret; + } + + /* Add the QEMU options to d_config->b_info->extra + * -fsdev local,id=virtio9p,path=%s,security_model=none + * -device virtio-9p-pci,fsdev=virtio9p,mount_tag=%s + */ + for (i = 0; i < def->nfss; i++) { + virDomainFSDefPtr fs = def->fss[i]; + + /* Assign an alias */ + if (virAsprintf(&fs->info.alias, "fs%zu", i) < 0) + goto cleanup; + + if (!(fsstr = libxlBuildQemuFSStr(fs))) + goto cleanup; + if (!(fsdevstr = libxlBuildQemuFSDevStr(fs))) + goto cleanup; + + if (VIR_STRDUP(fsdevargstr, "-fsdev") < 0 || + VIR_STRDUP(deviceargstr, "-device") < 0) + goto cleanup; + + + /* Append to the extras before terminating NULL */ + if (VIR_APPEND_ELEMENT(d_config->b_info.extra, nextra, fsdevargstr) < 0 || + VIR_APPEND_ELEMENT(d_config->b_info.extra, nextra, fsstr) < 0 || + VIR_APPEND_ELEMENT(d_config->b_info.extra, nextra, deviceargstr) < 0 || + VIR_APPEND_ELEMENT(d_config->b_info.extra, nextra, fsdevstr) < 0) + goto cleanup; + } + ret = 0; + + /* Add the terminating NULL item */ + if (VIR_RESIZE_N(d_config->b_info.extra, nextra, nextra, 1) < 0) + goto cleanup; + d_config->b_info.extra[nextra++] = NULL; + + cleanup: + VIR_FREE(fsstr); + VIR_FREE(fsdevstr); + VIR_FREE(fsdevargstr); + VIR_FREE(deviceargstr); + return ret; +} + int libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, virDomainDefPtr def, @@ -1883,6 +2054,9 @@ libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, if (libxlMakePCIList(def, d_config) < 0) return -1; + if (libxlMakeMountList(def, d_config) < 0) + return -1; + /* * Now that any potential VFBs are defined, update the build info with * the data of the primary display. Some day libxl might implicitely do -- 2.1.4

4 3

[libvirt] blockcopy qemu fail and libvirt
by Vasiliy Tolstov 03 Dec '15

03 Dec '15

Hi, i'm use qemu 2.4.0 and libvirt 1.2.16 and try blockcopy to migrate vm disk virsh -c qemu+ssh://root@xxx/system blockcopy domain sda /dev/nbd2 --wait --pivot libvirt says: Successfully pivoted 2015-12-01 14:37:18.188+0000: 18288: info : libvirt version: 1.2.16 2015-12-01 14:37:18.188+0000: 18288: warning : virEventPollUpdateTimeout:268 : Ignoring invalid update timer -1 but virsh command returns zero exit code qemu blockcopy failed and target device contains zeroes. i see some qemu git commits about block/migration and block that can fix this isse, does qemu-devs confirm that this bug is fixed? Also libvirt devs - do you know about this libvirt issue (when virsh doing blockcopy and qemu process does not success complete blockcopy) ? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

1 0

[libvirt] [PATCH] add a nodnsmasq option for networks
by Serge Hallyn 03 Dec '15

03 Dec '15

Some people want to define a libvirt network but have dns served by another daemon. Libvirt used to support that, but hasn't for several years. Two long-open bugs on this are https://bugzilla.redhat.com/show_bug.cgi?id=636115 https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/584862 I'm not certain whether we really want to support this, as another option is to simply create the bridge with external tools and tell libvirt vms to use that bridge. However, if we do want to support it, this patch provides that support. This patch allows an admin to set <nodnsmasq>true</nodnsmasq> in a bridge definition to avoid having libvirt start a dnsmasq. Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- src/conf/network_conf.c | 15 +++++++++++++++ src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) Index: libvirt-1.2.16/src/conf/network_conf.c =================================================================== --- libvirt-1.2.16.orig/src/conf/network_conf.c +++ libvirt-1.2.16/src/conf/network_conf.c @@ -1985,6 +1985,7 @@ virNetworkDefParseXML(xmlXPathContextPtr xmlNodePtr virtPortNode = NULL; xmlNodePtr forwardNode = NULL; char *ipv6nogwStr = NULL; + char *noDnsmasqStr = NULL; char *trustGuestRxFilters = NULL; xmlNodePtr save = ctxt->node; xmlNodePtr bandwidthNode = NULL; @@ -2018,6 +2019,20 @@ virNetworkDefParseXML(xmlXPathContextPtr def->uuid_specified = true; } + /* check if user requested no dnsmasq */ + noDnsmasqStr = virXPathString("string(./nodnsmasq[1])", ctxt); + if (noDnsmasqStr) { + if (STREQ(noDnsmasqStr, "yes") || STREQ(noDnsmasqStr, "true")) { + def->nodnsmasq = true; + } else if (STRNEQ(noDnsmasqStr, "no") && STRNEQ(noDnsmasqStr, "false")) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid nodnsmasq setting '%s' in network '%s'"), + noDnsmasqStr, def->name); + goto error; + } + VIR_FREE(noDnsmasqStr); + } + /* check if definitions with no IPv6 gateway addresses is to * allow guest-to-guest communications. */ @@ -2660,6 +2675,9 @@ virNetworkDefFormatBuf(virBufferPtr buf, virUUIDFormat(uuid, uuidstr); virBufferAsprintf(buf, "<uuid>%s</uuid>\n", uuidstr); + if (def->nodnsmasq) + virBufferAsprintf(buf, "<nodnsmasq>true</nodnsmasq>\n"); + if (def->forward.type != VIR_NETWORK_FORWARD_NONE) { const char *dev = NULL; if (!def->forward.npfs) Index: libvirt-1.2.16/src/conf/network_conf.h =================================================================== --- libvirt-1.2.16.orig/src/conf/network_conf.h +++ libvirt-1.2.16/src/conf/network_conf.h @@ -231,6 +231,7 @@ struct _virNetworkDef { bool stp; /* Spanning tree protocol */ virMacAddr mac; /* mac address of bridge device */ bool mac_specified; + bool nodnsmasq; /* specified if ip6tables rules added * when no ipv6 gateway addresses specified. Index: libvirt-1.2.16/src/network/bridge_driver.c =================================================================== --- libvirt-1.2.16.orig/src/network/bridge_driver.c +++ libvirt-1.2.16/src/network/bridge_driver.c @@ -2146,7 +2146,7 @@ networkStartNetworkVirtual(virNetworkDri /* start dnsmasq if there are any IP addresses (v4 or v6) */ - if ((v4present || v6present) && + if ((v4present || v6present) && !network->def->nodnsmasq && networkStartDhcpDaemon(driver, network) < 0) goto err3;

2 2

[libvirt] [PATCH v2 0/2] libxl: implement virDomainInterfaceStats
by Joao Martins 03 Dec '15

03 Dec '15

Hey, This patch series implements virDomainInterfaceStats but based on "ConsoleCallback" as opposed of doing it in libxlDomainStart. The series is divided as following: Patch 1 renames console callback to something more generic and Patch 2 implements virDomainInterfaceStats also taking the previous review (v3 statistics) comments. Changes since v1: - Improve error reporting in case interface is not known - Use libxl_device_nic_list as opposed to libxl_domain_config Regards, Joao Joao Martins (2): libxl: rename libxlConsoleCallback libxl: implement virDomainInterfaceStats src/libxl/libxl_domain.c | 33 ++++++++++++++++++++++++++++-- src/libxl/libxl_driver.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 2 deletions(-) -- 2.1.4

2 8

[libvirt] [PATCH] network: selectively disable -Wcast-align in virNetDevParseDadStatus
by Ian Campbell 03 Dec '15

03 Dec '15

Commit 0f7436ca54c9 "network: wait for DAD to finish for bridge IPv6 addresses" results in: CC util/libvirt_util_la-virnetdevmacvlan.lo util/virnetdev.c: In function 'virNetDevParseDadStatus': util/virnetdev.c:1319:188: error: cast increases required alignment of target type [-Werror=cast-align] util/virnetdev.c:1332:41: error: cast increases required alignment of target type [-Werror=cast-align] util/virnetdev.c:1334:92: error: cast increases required alignment of target type [-Werror=cast-align] cc1: all warnings being treated as errors on at least ARM platforms. The three macros involved (NLMSG_NEXT, IFA_RTA and RTA_NEXT) all appear to correctly take care of alignment, therefore suppress Wcast-align around their uses. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> Cc: Maxim Perevedentsev <mperevedentsev(a)virtuozzo.com> Cc: Laine Stump <laine(a)laine.org> Cc: Dario Faggioli <dario.faggioli(a)citrix.com> Cc: Jim Fehlig <jfehlig(a)suse.com> --- src/util/virnetdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index ade9afa..0bc809e 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1316,7 +1316,10 @@ virNetDevParseDadStatus(struct nlmsghdr *nlh, int len, struct rtattr *rtattr_ptr; size_t i; struct in6_addr *addr; + + VIR_WARNINGS_NO_CAST_ALIGN for (; NLMSG_OK(nlh, len); nlh = NLMSG_NEXT(nlh, len)) { + VIR_WARNINGS_RESET if (NLMSG_PAYLOAD(nlh, 0) < sizeof(struct ifaddrmsg)) { /* Message without payload is the last one. */ break; @@ -1329,9 +1332,11 @@ virNetDevParseDadStatus(struct nlmsghdr *nlh, int len, } ifaddrmsg_len = IFA_PAYLOAD(nlh); + VIR_WARNINGS_NO_CAST_ALIGN rtattr_ptr = (struct rtattr *) IFA_RTA(ifaddrmsg_ptr); for (; RTA_OK(rtattr_ptr, ifaddrmsg_len); rtattr_ptr = RTA_NEXT(rtattr_ptr, ifaddrmsg_len)) { + VIR_WARNINGS_RESET if (RTA_PAYLOAD(rtattr_ptr) != sizeof(struct in6_addr)) { /* No address: ignore. */ continue; -- 2.1.4

3 4

[libvirt] [libvirt-perl][PATCH] Add VIR_FROM_LOGGING constant
by Michal Privoznik 02 Dec '15

02 Dec '15

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Virt.xs | 1 + lib/Sys/Virt/Error.pm | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Virt.xs b/Virt.xs index c7cce27..db04fc2 100644 --- a/Virt.xs +++ b/Virt.xs @@ -8239,6 +8239,7 @@ BOOT: REGISTER_CONSTANT(VIR_FROM_POLKIT, FROM_POLKIT); REGISTER_CONSTANT(VIR_FROM_THREAD, FROM_THREAD); REGISTER_CONSTANT(VIR_FROM_ADMIN, FROM_ADMIN); + REGISTER_CONSTANT(VIR_FROM_LOGGING, FROM_LOGGING); REGISTER_CONSTANT(VIR_ERR_OK, ERR_OK); diff --git a/lib/Sys/Virt/Error.pm b/lib/Sys/Virt/Error.pm index d254daa..c5e1609 100644 --- a/lib/Sys/Virt/Error.pm +++ b/lib/Sys/Virt/Error.pm @@ -386,6 +386,10 @@ The thread helper utils The administrative service +=item Sys::Virt::Error::FROM_LOGGING + +The logging service + =back =head2 ERROR CODE CONSTANTS -- 2.4.10

2 1

[libvirt] Sign up for wiki?
by Scott Bronson 02 Dec '15

02 Dec '15

Hi, I'd like to update http://wiki.libvirt.org/page/Networking#Forwarding_Incoming_Connections The python script is now a broken link, and there's a better one at https://github.com/saschpe/libvirt-hook-qemu Username of 'bronson' is easiest for me to remember. Thanks! - Scott

2 1

[libvirt] [PATCH] fix LSB part of virtlogd runlevel script
by Olaf Hering 02 Dec '15

02 Dec '15

Currently pkg build of master branch fails: [ 300s] + /usr/lib/rpm/brp-boot-scripts [ 300s] E: File `virtlogd' is missing `Required-Start', please add even if empty! [ 300s] W: File `virtlogd' is missing `Required-Stop', please add even if empty! [ 300s] E: File `virtlogd' has empty `Default-Start', please specify default runlevel(s)! [ 300s] ERROR: found one or more broken init or boot scripts, please fix them. [ 300s] For more information about LSB headers please read the manual [ 300s] page of of insserv by executing the command `man 8 insserv'. [ 300s] If you don't understand this, mailto=werner(a)suse.de [ 300s] error: Bad exit status from /var/tmp/rpm-tmp.44965 (%install) Add the required tags, fix the existing tags. Use soft dependency "Should-Start" because virtlogd may work without network. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- src/logging/virtlogd.init.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/logging/virtlogd.init.in b/src/logging/virtlogd.init.in index 1408236..cc03615 100644 --- a/src/logging/virtlogd.init.in +++ b/src/logging/virtlogd.init.in @@ -5,8 +5,12 @@ # ### BEGIN INIT INFO # Provides: virtlogd -# Default-Start: -# Default-Stop: 0 1 2 3 4 5 6 +# Default-Start: 3 5 +# Required-Start: +# Required-Stop: +# Should-Start: $network $remote_fs +# Should-Stop $network $remote_fs: +# Default-Stop: 0 1 2 4 6 # Short-Description: virtual machine log manager # Description: This is a daemon for managing logs # of virtual machine consoles

2 4

[libvirt] [PATCH] qemu: add bootindex option to hostdev network interface commandline
by Laine Stump 02 Dec '15

02 Dec '15

when appropriate, of course. If the config for a domain specifies boot order with <boot dev='blah'/> elements, e.g.: <os> ... <boot dev='hd'/> <boot dev='network'/> </os> Then the first disk device in the config will have ",bootindex=1" appended to its qemu commandline -device options, and the first (and *only* the first) network interface device will get ",bootindex=2". However, if the first network interface device is a "hostdev" device (an SRIOV Virtual Function (VF) being assigned to the domain with vfio), then the bootindex option will *not* be appended. This happens because the bootindex=n option corresponding to the order of "<boot dev='network'/>" is added to the -device for the first network device when network device commandline args are constructed, but if it's a hostdev network device, its commandline arg is instead constructed in the loop for hostdevs. This patch fixes that omission by noticing (in bootHostdevNet) if the first network device was a hostdev, and if so passing on the proper bootindex to the commandline generator for hostdev devices - the result is that ",bootindex=2" will be properly appended to the first "network" device in the config even if it is really a hostdev (including if it is assigned from a libvirt network pool). (note that this is only the case if there is no <bootmenu enabled='yes'/> element in the config ("-boot menu-on" in qemu) , since the two are mutually exclusive - when the bootmenu is enabled, the individual per-device bootindex options can't be used by qemu, and we revert to using "-boot order=xyz" instead). If a greater level of control over boot order is desired (e.g., more than one network device should be tried, or a network device other than the first one encountered in the config), then <boot dev='network'/> in the <os> element should not be used; instead, the individual device elements in the config should be given a "<boot order='n'/> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1278421 --- src/qemu/qemu_command.c | 31 ++++++++++++++++++++++++++++--- src/qemu/qemu_command.h | 1 + src/qemu/qemu_hotplug.c | 4 ++-- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4d00fd9..183ab97 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5978,6 +5978,7 @@ qemuOpenPCIConfig(virDomainHostdevDefPtr dev) char * qemuBuildPCIHostdevDevStr(virDomainDefPtr def, virDomainHostdevDefPtr dev, + int bootIndex, /* used iff dev->info->bootIndex == 0 */ const char *configfd, virQEMUCapsPtr qemuCaps) { @@ -6020,7 +6021,9 @@ qemuBuildPCIHostdevDevStr(virDomainDefPtr def, pcisrc->addr.function); virBufferAsprintf(&buf, ",id=%s", dev->info->alias); if (dev->info->bootIndex) - virBufferAsprintf(&buf, ",bootindex=%d", dev->info->bootIndex); + bootIndex = dev->info->bootIndex; + if (bootIndex) + virBufferAsprintf(&buf, ",bootindex=%d", bootIndex); if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0) goto error; if (qemuBuildRomStr(&buf, dev->info, qemuCaps) < 0) @@ -9166,7 +9169,8 @@ qemuBuildCommandLine(virConnectPtr conn, char *boot_order_str = NULL, *boot_opts_str = NULL; virBuffer fdc_opts = VIR_BUFFER_INITIALIZER; char *fdc_opts_str = NULL; - int bootCD = 0, bootFloppy = 0, bootDisk = 0; + int bootCD = 0, bootFloppy = 0, bootDisk = 0, bootHostdevNet = 0; + VIR_DEBUG("conn=%p driver=%p def=%p mon=%p json=%d " "qemuCaps=%p migrateURI=%s snapshot=%p vmop=%d", @@ -10154,6 +10158,16 @@ qemuBuildCommandLine(virConnectPtr conn, goto error; last_good_net = i; + /* if this interface is a type='hostdev' interface and we + * haven't yet added a "bootindex" parameter to an + * emulated network device, save the bootindex - hostdev + * interface commandlines will be built later on when we + * cycle through all the hostdevs, and we'll use it then. + */ + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_HOSTDEV && + bootHostdevNet == 0) { + bootHostdevNet = bootNet; + } bootNet = 0; } } @@ -10871,6 +10885,16 @@ qemuBuildCommandLine(virConnectPtr conn, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { char *configfd_name = NULL; + int bootIndex = hostdev->info->bootIndex; + + /* bootNet will be non-0 if boot order was set and no other + * net devices were encountered + */ + if (hostdev->parent.type == VIR_DOMAIN_DEVICE_NET && + bootIndex == 0) { + bootIndex = bootHostdevNet; + bootHostdevNet = 0; + } if ((backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_CONFIGFD)) { int configfd = qemuOpenPCIConfig(hostdev); @@ -10886,7 +10910,8 @@ qemuBuildCommandLine(virConnectPtr conn, } } virCommandAddArg(cmd, "-device"); - devstr = qemuBuildPCIHostdevDevStr(def, hostdev, configfd_name, qemuCaps); + devstr = qemuBuildPCIHostdevDevStr(def, hostdev, bootIndex, + configfd_name, qemuCaps); VIR_FREE(configfd_name); if (!devstr) goto error; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index bebdd27..c773b8f 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -180,6 +180,7 @@ char *qemuBuildPCIHostdevPCIDevStr(virDomainHostdevDefPtr dev, /* Current, best practice */ char *qemuBuildPCIHostdevDevStr(virDomainDefPtr def, virDomainHostdevDefPtr dev, + int bootIndex, const char *configfd, virQEMUCapsPtr qemuCaps); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 8804d3d..872ebcd 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1321,8 +1321,8 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, goto error; } - if (!(devstr = qemuBuildPCIHostdevDevStr(vm->def, hostdev, configfd_name, - priv->qemuCaps))) + if (!(devstr = qemuBuildPCIHostdevDevStr(vm->def, hostdev, 0, + configfd_name, priv->qemuCaps))) goto error; qemuDomainObjEnterMonitor(driver, vm); -- 2.4.3

2 1

[libvirt] [PATCH] log_manager: Include configmake.h last
by Michal Privoznik 02 Dec '15

02 Dec '15

The problem is that in some mingw header DATADIR is used but gnulib defines it too. This leads to the following compile error: CC locking/libvirt_driver_la-lock_manager.lo In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/objbase.h:66:0, from /usr/i686-w64-mingw32/sys-root/mingw/include/ole2.h:17, from /usr/i686-w64-mingw32/sys-root/mingw/include/wtypes.h:12, from /usr/i686-w64-mingw32/sys-root/mingw/include/winscard.h:10, from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:97, from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23, from ../gnulib/lib/unistd.h:48, from ../../src/util/virutil.h:29, from ../../src/logging/log_manager.c:30: /usr/i686-w64-mingw32/sys-root/mingw/include/objidl.h:12275:2: error: expected identifier or '(' before string constant } DATADIR; ^ Makefile:7888: recipe for target 'logging/libvirt_driver_la-log_manager.lo' failed The fix is to include configmake.h at the end of includes. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/logging/log_manager.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index 5ff5f12..7a4c7e2 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -22,8 +22,6 @@ #include <config.h> -#include "configmake.h" - #include "log_manager.h" #include "log_protocol.h" #include "viralloc.h" @@ -33,6 +31,7 @@ #include "virfile.h" #include "rpc/virnetclient.h" +#include "configmake.h" #define VIR_FROM_THIS VIR_FROM_LOGGING -- 2.4.10

3 2

[libvirt] [PATCH 0/8] Make loading domains with invalid XML possible
by Martin Kletzander 02 Dec '15

02 Dec '15

The RFC version [1] was ACKed, but I have found out that we could then cause inconsistency by calling virDomainCreateXML() or Restore() calls etc. This series is basically the same apart from the fact that it is rebased on current master and then one simple diff [2] is added to PATCH 5/8. [1] https://www.redhat.com/archives/libvir-list/2015-September/msg00698.html [2] diff to the previous version: diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 16f26acf4839..c8291be2b7b5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2875,6 +2875,14 @@ virDomainObjListAddLocked(virDomainObjListPtr doms, } } + if (vm->def->parseError) { + virReportError(VIR_ERR_XML_ERROR, + _("domain '%s' was not loaded due to an XML error " + "(%s), please redefine it"), + vm->def->name, vm->def->parseError); + virDomainObjEndAPI(&vm); + } + virDomainObjAssignDef(vm, def, !!(flags & VIR_DOMAIN_OBJ_LIST_ADD_LIVE), -- Martin Kletzander (8): conf, virsh: Add new domain shutoff reason qemu: Few whitespace cleanups conf: Extract name-parsing into its own function conf: Extract UUID parsing into its own function conf: Optionally keep domains with invalid XML, but don't allow starting them qemu: Don't lookup invalid domains unless specified otherwise qemu: Prepare basic APIs to handle invalid defs qemu: Load domains with invalid XML on start include/libvirt/libvirt-domain.h | 2 + src/bhyve/bhyve_driver.c | 2 + src/conf/domain_conf.c | 191 +++++++++++++++++++++++++++++++++------ src/conf/domain_conf.h | 5 + src/libxl/libxl_driver.c | 3 + src/lxc/lxc_driver.c | 3 + src/qemu/qemu_driver.c | 64 ++++++++++--- src/uml/uml_driver.c | 2 + tools/virsh-domain-monitor.c | 3 +- 9 files changed, 234 insertions(+), 41 deletions(-) -- 2.6.3

1 9

[libvirt] [PATCH RFC] allow to delete sheepdog snapshot
by Vasiliy Tolstov 02 Dec '15

02 Dec '15

This is first try to get ability to remove snapshot from sheepdog, I'm stuck ad the simple thing: sheepdog does not allow to remove snapshot with objects with message: ERROR [deletion] delete_vdi_work(1811) vid: XXXXX still has objects I'm check dog/vdi.c code and see, that in case of deletion vdi sheepdog write to all objects. Does i realy need to do this thing? Can somebody helps me? Also as i see block/sheepdog.c have delete vdi code and it very simple compared to dog/vdi.c... So, please help me =) Vasiliy Tolstov (1): allow to delete sheepdog snapshot block/sheepdog.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) -- 2.5.0

2 3

[libvirt] [PATCH] tests: Run virnetdaemontest iff WITH_YAJL
by Michal Privoznik 01 Dec '15

01 Dec '15

The test itself and daemon require a JSON parsing library. If not present, skip the test. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/virnetdaemontest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index 24cbd54..e5d09a3 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -26,7 +26,7 @@ #define VIR_FROM_THIS VIR_FROM_RPC -#ifdef HAVE_SOCKETPAIR +#if defined(HAVE_SOCKETPAIR) && defined(WITH_YAJL) static virNetServerPtr testCreateServer(const char *host, int family) { -- 2.4.10

2 1