- Devel - libvirt List Archives

[libvirt] [PATCH 00/12] implements iothread polling feature into libvirt
by Pavel Hrdina 21 Feb '17

21 Feb '17

Pavel Hrdina (12): conf: introduce domain XML element <polling> for iothread lib: introduce an API to add new iothread with parameters lib: introduce an API to modify parameters of existing iothread virsh: extend iothreadadd to support virDomainAddIOThreadParams virsh: introduce command iothreadmod that uses virDomainModIOThreadParams qemu_capabilities: detect whether iothread polling is supported util: properly handle NULL props in virQEMUBuildObjectCommandlineFromJSON qemu_monitor: extend qemuMonitorGetIOThreads to fetch polling data qemu: implement iothread polling qemu: implement virDomainAddIOThreadParams API qemu: implement virDomainModIOThreadParams API news: add entry for for iothread polling feature docs/formatdomain.html.in | 19 +- docs/news.xml | 9 + docs/schemas/domaincommon.rng | 24 ++ include/libvirt/libvirt-domain.h | 44 ++++ src/conf/domain_conf.c | 199 +++++++++++++- src/conf/domain_conf.h | 18 +- src/driver-hypervisor.h | 16 ++ src/libvirt-domain.c | 140 ++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 6 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 78 +++++- src/qemu/qemu_command.h | 5 +- src/qemu/qemu_domain.c | 23 +- src/qemu/qemu_domain.h | 6 + src/qemu/qemu_driver.c | 292 ++++++++++++++++++--- src/qemu/qemu_monitor.c | 25 +- src/qemu/qemu_monitor.h | 9 +- src/qemu/qemu_monitor_json.c | 51 +++- src/qemu/qemu_monitor_json.h | 7 +- src/qemu/qemu_process.c | 14 +- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 34 ++- src/remote_protocol-structs | 20 ++ src/util/virqemu.c | 3 +- .../generic-iothreads-no-polling.xml | 22 ++ .../generic-iothreads-polling-disabled.xml | 24 ++ .../generic-iothreads-polling-enabled-fail.xml | 24 ++ .../generic-iothreads-polling-enabled.xml | 24 ++ tests/genericxml2xmltest.c | 6 + .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 12 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemumonitorjsontest.c | 2 +- .../qemuxml2argv-iothreads-polling-disabled.args | 23 ++ .../qemuxml2argv-iothreads-polling-disabled.xml | 36 +++ .../qemuxml2argv-iothreads-polling-enabled.args | 23 ++ .../qemuxml2argv-iothreads-polling-enabled.xml | 36 +++ ...emuxml2argv-iothreads-polling-not-supported.xml | 1 + tests/qemuxml2argvtest.c | 8 + tests/testutils.c | 3 +- tools/virsh-domain.c | 188 ++++++++++++- tools/virsh.pod | 18 ++ 43 files changed, 1442 insertions(+), 58 deletions(-) create mode 100644 tests/genericxml2xmlindata/generic-iothreads-no-polling.xml create mode 100644 tests/genericxml2xmlindata/generic-iothreads-polling-disabled.xml create mode 100644 tests/genericxml2xmlindata/generic-iothreads-polling-enabled-fail.xml create mode 100644 tests/genericxml2xmlindata/generic-iothreads-polling-enabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-polling-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-polling-disabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-polling-enabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-polling-enabled.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-iothreads-polling-not-supported.xml -- 2.11.1

3 19

[libvirt] [PATCH v2 0/5] storage: modularize storage backend drivers
by Peter Krempa 21 Feb '17

21 Feb '17

Version 2 contains one more patch that adds disables the 'zfs' and 'vstorage' backends in the spec file. The rest is the same, but I've reposted it due to it's nature. Peter Krempa (5): spec: Don't check for storage driver backends in configure script storage: Turn storage backends into dynamic modules tests: drivermodule: Make sure that all compiled storage backends can be loaded spec: Modularize the storage driver news: Mention storage driver split docs/news.xml | 10 +++ libvirt.spec.in | 188 ++++++++++++++++++++++++++++++++++++------ src/Makefile.am | 85 ++++++++++++++++++- src/storage/storage_backend.c | 70 ++++++++++++---- src/storage/storage_backend.h | 2 +- src/storage/storage_driver.c | 19 ++++- src/storage/storage_driver.h | 1 + tests/Makefile.am | 4 +- tests/virdrivermoduletest.c | 2 +- tests/virstoragetest.c | 2 +- 10 files changed, 337 insertions(+), 46 deletions(-) -- 2.11.1

2 7

[libvirt] spice-gl bug: Failed to initialize EGL render node for SPICE GL
by Paul Kek 21 Feb '17

21 Feb '17

Hello, I am having issues with getting spice-gl to work properly with libvirt. There is a bugzilla report which describes the issue but until now there is still no solution (The patch didn't work on my system.) As I also mentioned there, I tried adding the `renderD128` device to `cgroup_device_acl` in the qemu.conf file but this produced different errors: qemu-system-x86_64: egl: eglGetDisplay failed qemu-system-x86_64: egl: EGL_KHR_surfaceless_context not supported qemu-system-x86_64: Failed to initialize EGL render node for SPICE GL Paul

2 1

[libvirt] [PATCH] rpc: fix use-after-free when sending event message
by Wang King 20 Feb '17

20 Feb '17

If there is a process with a client which registers event callbacks, and it calls libvirt's API which uses the same virConnectPtr in that callback function. When this process exit abnormally lead to client disconnect, there is a possibility that the main thread is refer to virServerClient just after the virServerClient been freed by job thread of libvirtd. Following is the backtrace: #0 0x00007fda223d66d8 in virClassIsDerivedFrom (klass=0xdeadbeef,parent=0x7fda24c81b40) #1 0x00007fda223d6a1e in virObjectIsClass (anyobj=anyobj@entry=0x7fd9e575b400,klass=<optimized out>) #2 0x00007fda223d6a44 in virObjectLock (anyobj=anyobj@entry=0x7fd9e575b400) #3 0x00007fda22507f71 in virNetServerClientSendMessage (client=client@entry=0x7fd9e575b400, msg=msg@entry=0x7fd9ec30de90) #4 0x00007fda230d714d in remoteDispatchObjectEventSend (client=0x7fd9e575b400, program=0x7fda24c844e0, procnr=procnr@entry=348, proc=0x7fda2310e5e0 <xdr_remote_domain_event_callback_tunable_msg>, data=data@entry=0x7ffc3857fdb0) #5 0x00007fda230dd71b in remoteRelayDomainEventTunable (conn=<optimized out>, dom=0x7fda27cd7660, params=0x7fda27f3aae0, nparams=1, opaque=0x7fd9e6c99e00) #6 0x00007fda224484cb in virDomainEventDispatchDefaultFunc (conn=0x7fda27cd0120, event=0x7fda2736ea00, cb=0x7fda230dd610 <remoteRelayDomainEventTunable>, cbopaque=0x7fd9e6c99e00) #7 0x00007fda22446871 in virObjectEventStateDispatchCallbacks (callbacks=<optimized out>, callbacks=<optimized out>, event=0x7fda2736ea00, state=0x7fda24ca3960) #8 virObjectEventStateQueueDispatch (callbacks=0x7fda24c65800, queue=0x7ffc3857fe90, state=0x7fda24ca3960) #9 virObjectEventStateFlush (state=0x7fda24ca3960) #10 virObjectEventTimer (timer=<optimized out>, opaque=0x7fda24ca3960) #11 0x00007fda223ae8b9 in virEventPollDispatchTimeouts () #12 virEventPollRunOnce () #13 0x00007fda223ad1d2 in virEventRunDefaultImpl () #14 0x00007fda225046cd in virNetDaemonRun (dmn=dmn@entry=0x7fda24c775c0) #15 0x00007fda230d6351 in main (argc=<optimized out>, argv=<optimized out>) (gdb) p *(virNetServerClientPtr)0x7fd9e575b400 $2 = {parent = {parent = {u = {dummy_align1 = 140573849338048, dummy_align2 = 0x7fd9e65ac0c0, s = {magic = 3864707264, refs = 32729}}, klass = 0x7fda00000078}, lock = {lock = {__data = {__lock = 0, __count = 0, __owner = 0, __nusers = 0, __kind = 0, __spins = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = '\000' <repeats 39 times>, __align = 0}}}, wantClose = false, delayedClose = false, sock = 0x0, auth = 0, readonly = false, tlsCtxt = 0x0, tls = 0x0, sasl = 0x0, sockTimer = 0, identity = 0x0, nrequests = 0, nrequests_max = 0, rx = 0x0, tx = 0x0, filters = 0x0, nextFilterID = 0, dispatchFunc = 0x0, dispatchOpaque = 0x0, privateData = 0x0, privateDataFreeFunc = 0x0, privateDataPreExecRestart = 0x0, privateDataCloseFunc = 0x0, keepalive = 0x0} --- src/rpc/virnetserverclient.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 81da82c..562516f 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1021,6 +1021,12 @@ void virNetServerClientClose(virNetServerClientPtr client) client->sock = NULL; } + if (client->privateData && + client->privateDataFreeFunc) { + client->privateDataFreeFunc(client->privateData); + client->privateData = NULL; + } + virObjectUnlock(client); } -- 2.8.3

2 1

[libvirt] [PATCH] conf: fix use-after-free when sending event message
by Wang King 20 Feb '17

20 Feb '17

If there is a process with a client which registers event callbacks, and it calls libvirt's API which uses the same virConnectPtr in that callback function. When this process exit abnormally lead to client disconnect, there is a possibility that the main thread is refer to virServerClient just after the virServerClient been freed by job thread of libvirtd. Following is the backtrace: #0 0x00007fda223d66d8 in virClassIsDerivedFrom (klass=0xdeadbeef,parent=0x7fda24c81b40) #1 0x00007fda223d6a1e in virObjectIsClass (anyobj=anyobj@entry=0x7fd9e575b400,klass=<optimized out>) #2 0x00007fda223d6a44 in virObjectLock (anyobj=anyobj@entry=0x7fd9e575b400) #3 0x00007fda22507f71 in virNetServerClientSendMessage (client=client@entry=0x7fd9e575b400, msg=msg@entry=0x7fd9ec30de90) #4 0x00007fda230d714d in remoteDispatchObjectEventSend (client=0x7fd9e575b400, program=0x7fda24c844e0, procnr=procnr@entry=348, proc=0x7fda2310e5e0 <xdr_remote_domain_event_callback_tunable_msg>, data=data@entry=0x7ffc3857fdb0) #5 0x00007fda230dd71b in remoteRelayDomainEventTunable (conn=<optimized out>, dom=0x7fda27cd7660, params=0x7fda27f3aae0, nparams=1, opaque=0x7fd9e6c99e00) #6 0x00007fda224484cb in virDomainEventDispatchDefaultFunc (conn=0x7fda27cd0120, event=0x7fda2736ea00, cb=0x7fda230dd610 <remoteRelayDomainEventTunable>, cbopaque=0x7fd9e6c99e00) #7 0x00007fda22446871 in virObjectEventStateDispatchCallbacks (callbacks=<optimized out>, callbacks=<optimized out>, event=0x7fda2736ea00, state=0x7fda24ca3960) #8 virObjectEventStateQueueDispatch (callbacks=0x7fda24c65800, queue=0x7ffc3857fe90, state=0x7fda24ca3960) #9 virObjectEventStateFlush (state=0x7fda24ca3960) #10 virObjectEventTimer (timer=<optimized out>, opaque=0x7fda24ca3960) #11 0x00007fda223ae8b9 in virEventPollDispatchTimeouts () #12 virEventPollRunOnce () #13 0x00007fda223ad1d2 in virEventRunDefaultImpl () #14 0x00007fda225046cd in virNetDaemonRun (dmn=dmn@entry=0x7fda24c775c0) #15 0x00007fda230d6351 in main (argc=<optimized out>, argv=<optimized out>) (gdb) p *(virNetServerClientPtr)0x7fd9e575b400 $2 = {parent = {parent = {u = {dummy_align1 = 140573849338048, dummy_align2 = 0x7fd9e65ac0c0, s = {magic = 3864707264, refs = 32729}}, klass = 0x7fda00000078}, lock = {lock = {__data = {__lock = 0, __count = 0, __owner = 0, __nusers = 0, __kind = 0, __spins = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = '\000' <repeats 39 times>, __align = 0}}}, wantClose = false, delayedClose = false, sock = 0x0, auth = 0, readonly = false, tlsCtxt = 0x0, tls = 0x0, sasl = 0x0, sockTimer = 0, identity = 0x0, nrequests = 0, nrequests_max = 0, rx = 0x0, tx = 0x0, filters = 0x0, nextFilterID = 0, dispatchFunc = 0x0, dispatchOpaque = 0x0, privateData = 0x0, privateDataFreeFunc = 0x0, privateDataPreExecRestart = 0x0, privateDataCloseFunc = 0x0, keepalive = 0x0} --- src/rpc/virnetserverclient.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 81da82c..562516f 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1021,6 +1021,12 @@ void virNetServerClientClose(virNetServerClientPtr client) client->sock = NULL; } + if (client->privateData && + client->privateDataFreeFunc) { + client->privateDataFreeFunc(client->privateData); + client->privateData = NULL; + } + virObjectUnlock(client); } -- 2.8.3

2 1

[libvirt] [PATCH] Format printf format specifier used with niothreadids
by Daniel P. Berrange 20 Feb '17

20 Feb '17

The niothreadids struct field is size_t, so must use %zu not %lu with printf. While they're identical on some platforms, on others they are different, causing warnings conf/domain_conf.c: In function 'virDomainDefCheckABIStabilityFlags': conf/domain_conf.c:19575:26: error: format '%lu' expects argument of type 'long unsigned int', but argument 7 has type 'size_t {aka unsigned int}' [-Werror=format=] _("Target domain iothreads count %lu does not " ^ conf/domain_conf.c: In function 'virDomainDefFormatInternal': conf/domain_conf.c:23915:46: error: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'size_t {aka unsigned int}' [-Werror=format=] virBufferAsprintf(buf, "<iothreads>%lu</iothreads>\n", ^ Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed to fix Win32 builds src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ea2cd0e..79bdbdf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19572,8 +19572,8 @@ virDomainDefCheckABIStabilityFlags(virDomainDefPtr src, if (src->niothreadids != dst->niothreadids) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain iothreads count %lu does not " - "match source %lu"), + _("Target domain iothreads count %zu does not " + "match source %zu"), dst->niothreadids, src->niothreadids); goto error; } @@ -23912,7 +23912,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto error; if (def->niothreadids > 0) { - virBufferAsprintf(buf, "<iothreads>%lu</iothreads>\n", + virBufferAsprintf(buf, "<iothreads>%zu</iothreads>\n", def->niothreadids); if (virDomainDefIothreadShouldFormat(def)) { virBufferAddLit(buf, "<iothreadids>\n"); -- 2.9.3

1 0

[libvirt] [PATCH 00/13] iothread code cleanup
by Pavel Hrdina 20 Feb '17

20 Feb '17

This is a preparation for implementation of recently added iothread polling feature into QEMU. Pavel Hrdina (13): conf: fix indentation conf: remove redundant iothreads variable conf: move iothread parse code into its own function conf: store iothreads in order by iothread_id conf: always display iothread ids in the XML qemu_driver: check invalid iothread_id before we do anything else qemu_process: move capabilities check for iothreads qemu_process: remove unnecessary iothread check conf: move iothread XML validation from qemu_command qemu_driver: always check whether iothread is used by disk or not qemu_driver: move iothread existence check into one place qemu_driver: check whether iothread is used by controller qemu_driver: move iothread duplicate check into one place src/conf/domain_conf.c | 260 ++++++++++++++------- src/conf/domain_conf.h | 2 - src/qemu/qemu_command.c | 121 +--------- src/qemu/qemu_driver.c | 131 ++++++----- src/qemu/qemu_process.c | 61 ++--- .../qemuxml2argv-iothreads-ids-partial.args | 4 +- .../qemuxml2xmlout-cputune-iothreads.xml | 4 + ...l2xmlout-cputune-iothreadsched-zeropriority.xml | 6 + .../qemuxml2xmlout-cputune-iothreadsched.xml | 6 + .../qemuxml2xmlout-cputune-numatune.xml | 4 + .../qemuxml2xmlout-iothreads-disk-virtio-ccw.xml | 4 + .../qemuxml2xmlout-iothreads-disk.xml | 4 + .../qemuxml2xmlout-iothreads-ids-partial.xml | 2 + .../qemuxml2xmlout-iothreads-virtio-scsi-ccw.xml | 4 + .../qemuxml2xmlout-iothreads-virtio-scsi-pci.xml | 4 + .../qemuxml2xmlout-iothreads.xml | 4 + .../qemuxml2xmlout-vcpu-placement-static.xml | 4 + 17 files changed, 334 insertions(+), 291 deletions(-) -- 2.11.1

2 31

[libvirt] [PATCH] node_device: Check return value for udev_new()
by Marc Hartmayer 20 Feb '17

20 Feb '17

The comment was actually wrong as https://www.freedesktop.org/software/systemd/man/udev_new.html mentions that on failure NULL is returned. Signed-off-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/node_device/node_device_udev.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 4b81312..4b0a875 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1491,13 +1491,11 @@ static int nodeStateInitialize(bool privileged, if (udevPCITranslateInit(privileged) < 0) goto cleanup; - /* - * http://www.kernel.org/pub/linux/utils/kernel/hotplug/libudev/libudev-udev.h… - * - * indicates no return value other than success, so we don't check - * its return value. - */ udev = udev_new(); + if (!udev) { + virReportOOMError(); + goto cleanup; + } #if HAVE_UDEV_LOGGING /* cast to get rid of missing-format-attribute warning */ udev_set_log_fn(udev, (udevLogFunctionPtr) udevLogFunction); -- 2.5.5

4 10

[libvirt] [PATCH] nwfilter_gentech_driver: Fix indentation and typo
by Nitesh Konkar 20 Feb '17

20 Feb '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/nwfilter/nwfilter_gentech_driver.c | 4 ++-- src/nwfilter/nwfilter_gentech_driver.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 761a01b..7dd2c97 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -448,7 +448,7 @@ virNWFilterIncludeDefToRuleInst(virNWFilterDriverStatePtr driver, * the filter and its subfilters. * @useNewFilter: instruct whether to use a newDef pointer rather than a * def ptr which is useful during a filter update - * @foundNewFilter: pointer to int indivating whether a newDef pointer was + * @foundNewFilter: pointer to int indicating whether a newDef pointer was * ever used; variable expected to be initialized to 0 by caller * @rulesout: array to be filled with rule instance * @nrulesout: counter to be filled with number of rule instances @@ -738,7 +738,7 @@ virNWFilterInstantiate(const unsigned char *vmuuid ATTRIBUTE_UNUSED, if (rc == 0 && (virNetDevValidateConfig(ifname, NULL, ifindex) <= 0)) { virResetLastError(); - /* interface changed/disppeared */ + /* interface changed/disappeared */ techdriver->allTeardown(ifname); rc = -1; } diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index 8349ab4..8163273 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -58,7 +58,7 @@ int virNWFilterInstantiateFilterLate(virNWFilterDriverStatePtr driver, int virNWFilterTeardownFilter(const virDomainNetDef *net); virNWFilterHashTablePtr virNWFilterCreateVarHashmap(char *macaddr, - const virNWFilterVarValue *value); + const virNWFilterVarValue *value); int virNWFilterDomainFWUpdateCB(virDomainObjPtr vm, void *data); -- 2.1.0

3 2

[libvirt] [PATCH] Disallow inclusion of files from src/conf into src/utils
by Peter Krempa 20 Feb '17

20 Feb '17

The utils code should stay separated from other code (except for very well justified cases). Unfortunately commit 272769beccd7479c75e700a6cb made it trivial to break the separation (and not get slapped by the syntax-check rule) by adding -I src/conf to the CFLAGS for utils. Remove this shortcut and except the two offenders from the syntax check so that the codebase can be kept separated. --- cfg.mk | 3 +++ src/Makefile.am | 3 +-- src/util/virclosecallbacks.h | 2 +- src/util/virhostdev.h | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cfg.mk b/cfg.mk index 69e3f3a1a..aaba61f1d 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1242,3 +1242,6 @@ exclude_file_name_regexp--sc_prohibit_always-defined_macros = \ exclude_file_name_regexp--sc_prohibit_readdir = \ ^tests/.*mock\.c$$ + +exclude_file_name_regexp--sc_prohibit_cross_inclusion = \ + ^(src/util/virclosecallbacks\.h|src/util/virhostdev\.h)$$ diff --git a/src/Makefile.am b/src/Makefile.am index 46ca272eb..4f3f8f0bd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1137,8 +1137,7 @@ libvirt_util_la_SOURCES = \ libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) \ $(DBUS_CFLAGS) $(LDEXP_LIBM) $(NUMACTL_CFLAGS) \ - $(POLKIT_CFLAGS) $(GNUTLS_CFLAGS) $(ACL_CFLAGS) \ - -I$(srcdir)/conf + $(POLKIT_CFLAGS) $(GNUTLS_CFLAGS) $(ACL_CFLAGS) libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) $(WIN32_EXTRA_LIBS) $(LIBXML_LIBS) \ diff --git a/src/util/virclosecallbacks.h b/src/util/virclosecallbacks.h index 4df0a0060..d48997181 100644 --- a/src/util/virclosecallbacks.h +++ b/src/util/virclosecallbacks.h @@ -25,7 +25,7 @@ #ifndef __VIR_CLOSE_CALLBACKS__ # define __VIR_CLOSE_CALLBACKS__ -# include "virdomainobjlist.h" +# include "conf/virdomainobjlist.h" typedef struct _virCloseCallbacks virCloseCallbacks; typedef virCloseCallbacks *virCloseCallbacksPtr; diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h index 4c1fea3ef..1202136c2 100644 --- a/src/util/virhostdev.h +++ b/src/util/virhostdev.h @@ -31,7 +31,7 @@ # include "virusb.h" # include "virscsi.h" # include "virscsivhost.h" -# include "domain_conf.h" +# include "conf/domain_conf.h" typedef enum { VIR_HOSTDEV_STRICT_ACS_CHECK = (1 << 0), /* strict acs check */ -- 2.11.0

3 4