- Devel - libvirt List Archives

[libvirt] [PATCH] vl.c deprecate incorrect CPUs topology
by Igor Mammedov 27 Aug '18

27 Aug '18

-smp [cpus],sockets/cores/threads[,maxcpus] should describe topology so that total number of logical CPUs [sockets * cores * threads] would be equal to [maxcpus], however historically we didn't have such check in QEMU and it is possible to start VM with an invalid topology. Deprecate invalid options combination so we can make sure that the topology VM started with is always correct in the future. Users with an invalid sockets/cores/threads/maxcpus values should fix their CLI to make sure that [sockets * cores * threads] == [maxcpus] Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- qemu-deprecated.texi | 11 +++++++++++ vl.c | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 87212b6..d5d9ce6 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -159,6 +159,17 @@ The 'file' driver for drives is no longer appropriate for character or host devices and will only accept regular files (S_IFREG). The correct driver for these file types is 'host_cdrom' or 'host_device' as appropriate. +@subsection -smp X,[socket=a,core=b,thread=c],maxcpus=Y (since 3.1) + +CPU topology properties should describe whole machine topology including +possible CPUs. but historically it was possible to start QEMU with +an incorrect topology where + socket * core * thread >= X && < maxcpus +which could lead to incorrect topology enumeration by the guest. +Support for invalid topology will be removed, end user must ensure +that topology described with -smp includes all possible cpus, i.e.: + socket * core * thread == maxcpus + @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) diff --git a/vl.c b/vl.c index 5ba06ad..bc53828 100644 --- a/vl.c +++ b/vl.c @@ -1238,6 +1238,12 @@ static void smp_parse(QemuOpts *opts) exit(1); } + if (sockets * cores * threads != max_cpus) { + warn_report("Invalid CPUs topology deprecated. " + "sockets (%u) * cores (%u) * threads (%u) " + "!= maxcpus (%u)", + sockets, cores, threads, max_cpus); + } if (sockets * cores * threads > max_cpus) { error_report("cpu topology: " "sockets (%u) * cores (%u) * threads (%u) > " -- 2.7.4

2 2

[libvirt] [PULL 00/12] Ui 20180823 v3 patches
by Gerd Hoffmann 27 Aug '18

27 Aug '18

The following changes since commit d0092d90eb546a8bbe9e9120426c189474123797: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180820' into staging (2018-08-20 17:41:18 +0100) are available in the git repository at: git://git.kraxel.org/qemu tags/ui-20180823-v3-pull-request for you to fetch changes up to 63cde1d13d0767f778a130e2c93c15ad709e1276: util: promote qemu_egl_rendernode_open() to libqemuutil (2018-08-23 11:53:26 +0200) ---------------------------------------------------------------- ui: misc fixes which piled up during 3.0 release freeze ---------------------------------------------------------------- Daniel P. Berrangé (2): doc: switch to modern syntax for VNC TLS setup vnc: remove support for deprecated tls, x509, x509verify options Marc-André Lureau (3): ui: use enum to string helpers dmabuf: add y0_top, pass it to spice util: promote qemu_egl_rendernode_open() to libqemuutil Paolo Bonzini (2): spice-display: access ptr_x/ptr_y under Mutex spice-display: fix qemu_spice_cursor_refresh_bh locking Peter Wu (1): vnc: fix memleak of the "vnc-worker-output" name Philippe Mathieu-Daudé (1): ui/vnc: Remove useless parenthesis around DIV_ROUND_UP macro Tao Wu (1): sdl2: redraw correctly when scanout_mode enabled. Thomas Huth (2): ui/sdl2: Remove the obsolete SDL_INIT_NOPARACHUTE flag ui/sdl2: Fix broken -full-screen CLI option include/qemu/drm.h | 6 ++++ include/ui/console.h | 1 + qemu-keymap.c | 2 +- ui/console.c | 6 ++-- ui/egl-helpers.c | 51 ++-------------------------- ui/sdl2-gl.c | 5 +++ ui/sdl2.c | 13 +++----- ui/spice-display.c | 42 +++++++++++++++-------- ui/vnc-enc-tight.c | 2 +- ui/vnc-jobs.c | 3 +- ui/vnc.c | 94 ++-------------------------------------------------- util/drm.c | 66 ++++++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + qemu-deprecated.texi | 20 ----------- qemu-doc.texi | 20 ++++++++--- qemu-options.hx | 43 ------------------------ util/Makefile.objs | 1 + 17 files changed, 139 insertions(+), 237 deletions(-) create mode 100644 include/qemu/drm.h create mode 100644 util/drm.c -- 2.9.3

2 14

[libvirt] [PATCH] apparmor: fix ptrace rules with kernel 4.18
by Christian Ehrhardt 27 Aug '18

27 Aug '18

Due to kernel upstream change 338d0be4 ("apparmor: fix ptrace read check") libvirt now hits apparmor denies like: apparmor="DENIED" operation="ptrace" profile="/usr/sbin/libvirtd" pid=4409 comm="libvirtd" requested_mask="read" denied_mask="read" peer="libvirt-14e92a75-7668-4b97-8f92-322fc1b9c78a" Extend the ptrace rule to also allow 'ptrace (read)' for libvirtd to work with these newer kernels. Fixes: https://bugs.launchpad.net/bugs/1788603 Reported-by: Thadeu Lima de Souza Cascardo <thadeu.cascardo(a)canonical.com> Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- examples/apparmor/usr.sbin.libvirtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index 80e348b7ee..f0ffc53008 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -50,10 +50,10 @@ # for --p2p migrations unix (send, receive) type=stream addr=none peer=(label=unconfined addr=none), - ptrace (trace) peer=unconfined, - ptrace (trace) peer=/usr/sbin/libvirtd, - ptrace (trace) peer=/usr/sbin/dnsmasq, - ptrace (trace) peer=libvirt-*, + ptrace (read,trace) peer=unconfined, + ptrace (read,trace) peer=/usr/sbin/libvirtd, + ptrace (read,trace) peer=/usr/sbin/dnsmasq, + ptrace (read,trace) peer=libvirt-*, signal (send) peer=/usr/sbin/dnsmasq, signal (read, send) peer=libvirt-*, -- 2.17.1

3 3

[libvirt] [PATCH v2] qemu: Start domain on a node without cpu affinity
by Roman Bolshakov 27 Aug '18

27 Aug '18

qemuProcessInitCpuAffinity prevents a VM from getting started on a platform that uses cpu affinity wrapper stubs e.g. macOS. The patch adds qemuProcessInitCpuAffinity stub on all platforms without HAVE_SCHED_GETAFFINITY or HAVE_BSD_CPU_AFFINITY. Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- Changes since v1: * Replaced no-op virProcessGetAffinity with qemuProcessInitCpuAffinity stub. src/qemu/qemu_process.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ab749389ee..28d52f01f6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2343,6 +2343,7 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriverPtr driver, /* * To be run between fork/exec of QEMU only */ +#if defined(HAVE_SCHED_GETAFFINITY) || defined(HAVE_BSD_CPU_AFFINITY) static int qemuProcessInitCpuAffinity(virDomainObjPtr vm) { @@ -2413,6 +2414,13 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm) virBitmapFree(hostcpumap); return ret; } +#else +static int +qemuProcessInitCpuAffinity(virDomainObjPtr vm ATTRIBUTE_UNUSED) +{ + return 0; +} +#endif /* set link states to down on interfaces at qemu start */ static int -- 2.17.0

2 1

[libvirt] [PATCH v2] util: eventpoll: Survive EBADF on macOS
by Roman Bolshakov 27 Aug '18

27 Aug '18

Fixes: https://www.redhat.com/archives/libvir-list/2017-January/msg00978.html QEMU is probed through monitor fd to check capabilities during libvirtd init. The monitor fd is closed after probing by virQEMUCapsInitQMPCommandFree that calls virQEMUCapsInitQMPCommandAbort that calls qemuMonitorClose, the latter one notifies the event loop via an interrupt handle in qemuMonitorUnregister and after then closes monitor fd. There could be a case when interrupt is sent after eventLoop is unlocked but before virEventPollRunOnce blocks in poll, shortly before file descriptor is closed by qemuMonitorClose. Then poll receives closed monitor fd in fdset and returns EBADF. EBADF is not mentioned as a valid errno on macOS poll man-page but such behaviour can appear release-to-release, according to cpython: https://github.com/python/cpython/blob/master/Modules/selectmodule.c#L1161 The change also fixes the issue in qemucapabilitiestest. It returns Bad file descriptor message 25 times without the fix. Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- Changes since v1: * Don't go through dispatch code on EBADF src/util/vireventpoll.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index 13d278df13..7d0ffd4113 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -643,6 +643,12 @@ int virEventPollRunOnce(void) EVENT_DEBUG("Poll got error event %d", errno); if (errno == EINTR || errno == EAGAIN) goto retry; +#ifdef __APPLE__ + if (errno == EBADF) { + virMutexLock(&eventLoop.lock); + goto stop; + } +#endif virReportSystemError(errno, "%s", _("Unable to poll on file handles")); return -1; @@ -660,6 +666,7 @@ int virEventPollRunOnce(void) virEventPollCleanupTimeouts(); virEventPollCleanupHandles(); + stop: eventLoop.running = 0; virMutexUnlock(&eventLoop.lock); return 0; -- 2.17.0

2 1

[libvirt] [PATCH v2 0/8] cpu: modularize the CPU map data file
by Daniel P. Berrangé 24 Aug '18

24 Aug '18

Currently we have a cpu_map.xml file that contains all the features and CPU models for all architectures in one place. I frequently find myself wondering about the differences between CPU models, but it is hard to compare them as the list of features is huge. With this patch series we end up with a large set of small files, one per named CPU model, along with one for the feature and vendor definitions cpu_map/index.xml cpu_map/ppc64_POWER6.xml cpu_map/ppc64_POWER7.xml cpu_map/ppc64_POWER8.xml cpu_map/ppc64_POWER9.xml cpu_map/ppc64_POWERPC_e5500.xml cpu_map/ppc64_POWERPC_e6500.xml cpu_map/ppc64_vendors.xml cpu_map/x86_486.xml cpu_map/x86_athlon.xml cpu_map/x86_Broadwell-IBRS.xml cpu_map/x86_Broadwell-noTSX-IBRS.xml cpu_map/x86_Broadwell-noTSX.xml cpu_map/x86_Broadwell.xml cpu_map/x86_Conroe.xml cpu_map/x86_core2duo.xml cpu_map/x86_coreduo.xml cpu_map/x86_cpu64-rhel5.xml cpu_map/x86_cpu64-rhel6.xml cpu_map/x86_EPYC-IBRS.xml cpu_map/x86_EPYC.xml cpu_map/x86_features.xml cpu_map/x86_Haswell-IBRS.xml cpu_map/x86_Haswell-noTSX-IBRS.xml cpu_map/x86_Haswell-noTSX.xml cpu_map/x86_Haswell.xml cpu_map/x86_IvyBridge-IBRS.xml cpu_map/x86_IvyBridge.xml cpu_map/x86_kvm32.xml cpu_map/x86_kvm64.xml cpu_map/x86_n270.xml cpu_map/x86_Nehalem-IBRS.xml cpu_map/x86_Nehalem.xml cpu_map/x86_Opteron_G1.xml cpu_map/x86_Opteron_G2.xml cpu_map/x86_Opteron_G3.xml cpu_map/x86_Opteron_G4.xml cpu_map/x86_Opteron_G5.xml cpu_map/x86_Penryn.xml cpu_map/x86_pentium2.xml cpu_map/x86_pentium3.xml cpu_map/x86_pentiumpro.xml cpu_map/x86_pentium.xml cpu_map/x86_phenom.xml cpu_map/x86_qemu32.xml cpu_map/x86_qemu64.xml cpu_map/x86_SandyBridge-IBRS.xml cpu_map/x86_SandyBridge.xml cpu_map/x86_Skylake-Client-IBRS.xml cpu_map/x86_Skylake-Client.xml cpu_map/x86_Skylake-Server-IBRS.xml cpu_map/x86_Skylake-Server.xml cpu_map/x86_vendors.xml cpu_map/x86_Westmere-IBRS.xml cpu_map/x86_Westmere.xml The main cpu_map/index.xml file is now just a list of <include filename="XXX"/> statements to pull in the individual files Now we can easily see the differences in each model: $ diff cpu_map/x86_Broadwell.xml cpu_map/x86_Skylake-Client.xml 2,3c2,3 < <model name='Broadwell'> < <signature family='6' model='61'/> --- > <model name='Skylake-Client'> > <signature family='6' model='94'/> 5a6 > <feature name='abm'/> 8a10 > <feature name='arat'/> 18a21 > <feature name='f16c'/> 30a34 > <feature name='mpx'/> 42a47 > <feature name='rdrand'/> 56a62 > <feature name='vme'/> 57a64 > <feature name='xgetbv1'/> 58a66,67 > <feature name='xsavec'/> > <feature name='xsaveopt'/> Changed in v2: - Moved all XML files into a new src/cpu_map/ directory - Simplify the goto labels for error code paths. - Code style fixes Daniel P. Berrangé (8): cpu: allow include files for CPU definition cpu: fix cleanup when signature parsing fails cpu: push more parsing logic into common code cpu: simplify failure cleanup paths cpu: move the CPU map data files into a src/cpu_map directory cpu: split PPC64 map data into separate files cpu: split x86 map data into separate files xml: report the filename (if any) when parsing files libvirt.spec.in | 2 +- mingw-libvirt.spec.in | 4 +- src/Makefile.am | 7 +- src/cpu/cpu_map.c | 161 +- src/cpu/cpu_map.h | 22 +- src/cpu/cpu_map.xml | 2382 ---------------------- src/cpu/cpu_ppc64.c | 142 +- src/cpu/cpu_x86.c | 255 +-- src/cpu_map/Makefile.inc.am | 61 + src/cpu_map/index.xml | 75 + src/cpu_map/ppc64_POWER6.xml | 6 + src/cpu_map/ppc64_POWER7.xml | 7 + src/cpu_map/ppc64_POWER8.xml | 8 + src/cpu_map/ppc64_POWER9.xml | 6 + src/cpu_map/ppc64_POWERPC_e5500.xml | 6 + src/cpu_map/ppc64_POWERPC_e6500.xml | 6 + src/cpu_map/ppc64_vendors.xml | 4 + src/cpu_map/x86_486.xml | 7 + src/cpu_map/x86_Broadwell-IBRS.xml | 61 + src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 59 + src/cpu_map/x86_Broadwell-noTSX.xml | 58 + src/cpu_map/x86_Broadwell.xml | 60 + src/cpu_map/x86_Conroe.xml | 33 + src/cpu_map/x86_EPYC-IBRS.xml | 73 + src/cpu_map/x86_EPYC.xml | 72 + src/cpu_map/x86_Haswell-IBRS.xml | 57 + src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 55 + src/cpu_map/x86_Haswell-noTSX.xml | 54 + src/cpu_map/x86_Haswell.xml | 56 + src/cpu_map/x86_IvyBridge-IBRS.xml | 51 + src/cpu_map/x86_IvyBridge.xml | 50 + src/cpu_map/x86_Nehalem-IBRS.xml | 38 + src/cpu_map/x86_Nehalem.xml | 37 + src/cpu_map/x86_Opteron_G1.xml | 31 + src/cpu_map/x86_Opteron_G2.xml | 35 + src/cpu_map/x86_Opteron_G3.xml | 40 + src/cpu_map/x86_Opteron_G4.xml | 50 + src/cpu_map/x86_Opteron_G5.xml | 53 + src/cpu_map/x86_Penryn.xml | 35 + src/cpu_map/x86_SandyBridge-IBRS.xml | 45 + src/cpu_map/x86_SandyBridge.xml | 44 + src/cpu_map/x86_Skylake-Client-IBRS.xml | 70 + src/cpu_map/x86_Skylake-Client.xml | 69 + src/cpu_map/x86_Skylake-Server-IBRS.xml | 77 + src/cpu_map/x86_Skylake-Server.xml | 76 + src/cpu_map/x86_Westmere-IBRS.xml | 39 + src/cpu_map/x86_Westmere.xml | 38 + src/cpu_map/x86_athlon.xml | 28 + src/cpu_map/x86_core2duo.xml | 33 + src/cpu_map/x86_coreduo.xml | 29 + src/cpu_map/x86_cpu64-rhel5.xml | 29 + src/cpu_map/x86_cpu64-rhel6.xml | 31 + src/cpu_map/x86_features.xml | 440 ++++ src/cpu_map/x86_kvm32.xml | 26 + src/cpu_map/x86_kvm64.xml | 30 + src/cpu_map/x86_n270.xml | 30 + src/cpu_map/x86_pentium.xml | 13 + src/cpu_map/x86_pentium2.xml | 22 + src/cpu_map/x86_pentium3.xml | 23 + src/cpu_map/x86_pentiumpro.xml | 21 + src/cpu_map/x86_phenom.xml | 36 + src/cpu_map/x86_qemu32.xml | 22 + src/cpu_map/x86_qemu64.xml | 40 + src/cpu_map/x86_vendors.xml | 4 + src/util/virxml.c | 3 +- 65 files changed, 2819 insertions(+), 2718 deletions(-) delete mode 100644 src/cpu/cpu_map.xml create mode 100644 src/cpu_map/Makefile.inc.am create mode 100644 src/cpu_map/index.xml create mode 100644 src/cpu_map/ppc64_POWER6.xml create mode 100644 src/cpu_map/ppc64_POWER7.xml create mode 100644 src/cpu_map/ppc64_POWER8.xml create mode 100644 src/cpu_map/ppc64_POWER9.xml create mode 100644 src/cpu_map/ppc64_POWERPC_e5500.xml create mode 100644 src/cpu_map/ppc64_POWERPC_e6500.xml create mode 100644 src/cpu_map/ppc64_vendors.xml create mode 100644 src/cpu_map/x86_486.xml create mode 100644 src/cpu_map/x86_Broadwell-IBRS.xml create mode 100644 src/cpu_map/x86_Broadwell-noTSX-IBRS.xml create mode 100644 src/cpu_map/x86_Broadwell-noTSX.xml create mode 100644 src/cpu_map/x86_Broadwell.xml create mode 100644 src/cpu_map/x86_Conroe.xml create mode 100644 src/cpu_map/x86_EPYC-IBRS.xml create mode 100644 src/cpu_map/x86_EPYC.xml create mode 100644 src/cpu_map/x86_Haswell-IBRS.xml create mode 100644 src/cpu_map/x86_Haswell-noTSX-IBRS.xml create mode 100644 src/cpu_map/x86_Haswell-noTSX.xml create mode 100644 src/cpu_map/x86_Haswell.xml create mode 100644 src/cpu_map/x86_IvyBridge-IBRS.xml create mode 100644 src/cpu_map/x86_IvyBridge.xml create mode 100644 src/cpu_map/x86_Nehalem-IBRS.xml create mode 100644 src/cpu_map/x86_Nehalem.xml create mode 100644 src/cpu_map/x86_Opteron_G1.xml create mode 100644 src/cpu_map/x86_Opteron_G2.xml create mode 100644 src/cpu_map/x86_Opteron_G3.xml create mode 100644 src/cpu_map/x86_Opteron_G4.xml create mode 100644 src/cpu_map/x86_Opteron_G5.xml create mode 100644 src/cpu_map/x86_Penryn.xml create mode 100644 src/cpu_map/x86_SandyBridge-IBRS.xml create mode 100644 src/cpu_map/x86_SandyBridge.xml create mode 100644 src/cpu_map/x86_Skylake-Client-IBRS.xml create mode 100644 src/cpu_map/x86_Skylake-Client.xml create mode 100644 src/cpu_map/x86_Skylake-Server-IBRS.xml create mode 100644 src/cpu_map/x86_Skylake-Server.xml create mode 100644 src/cpu_map/x86_Westmere-IBRS.xml create mode 100644 src/cpu_map/x86_Westmere.xml create mode 100644 src/cpu_map/x86_athlon.xml create mode 100644 src/cpu_map/x86_core2duo.xml create mode 100644 src/cpu_map/x86_coreduo.xml create mode 100644 src/cpu_map/x86_cpu64-rhel5.xml create mode 100644 src/cpu_map/x86_cpu64-rhel6.xml create mode 100644 src/cpu_map/x86_features.xml create mode 100644 src/cpu_map/x86_kvm32.xml create mode 100644 src/cpu_map/x86_kvm64.xml create mode 100644 src/cpu_map/x86_n270.xml create mode 100644 src/cpu_map/x86_pentium.xml create mode 100644 src/cpu_map/x86_pentium2.xml create mode 100644 src/cpu_map/x86_pentium3.xml create mode 100644 src/cpu_map/x86_pentiumpro.xml create mode 100644 src/cpu_map/x86_phenom.xml create mode 100644 src/cpu_map/x86_qemu32.xml create mode 100644 src/cpu_map/x86_qemu64.xml create mode 100644 src/cpu_map/x86_vendors.xml -- 2.17.1

3 19

[libvirt] [PULL 0/3] Ui2 20180824 patches
by Gerd Hoffmann 24 Aug '18

24 Aug '18

The following changes since commit 5ccac548faf041ff5229a8e8342e3be14a34c8af: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2018-08-23 17:35:48 +0100) are available in the git repository at: git://git.kraxel.org/qemu tags/ui2-20180824-pull-request for you to fetch changes up to eb01505ea6c8330273d189acc053cc60d00bfa1a: ui: remove support for SDL1.2 in favour of SDL2 (2018-08-24 09:31:39 +0200) ---------------------------------------------------------------- ui: remove deprecated UI frontends ---------------------------------------------------------------- Daniel P. Berrangé (3): ui: remove support for GTK2 in favour of GTK3 ui: increase min required GTK3 version to 3.14.0 ui: remove support for SDL1.2 in favour of SDL2 configure | 111 +----- include/ui/gtk.h | 9 - ui/sdl_zoom.h | 25 -- ui/sdl_zoom_template.h | 219 ----------- ui/gtk-egl.c | 10 +- ui/gtk.c | 202 +--------- ui/sdl.c | 1027 ------------------------------------------------ ui/sdl_zoom.c | 93 ----- qemu-deprecated.texi | 16 - ui/Makefile.objs | 5 - 10 files changed, 33 insertions(+), 1684 deletions(-) delete mode 100644 ui/sdl_zoom.h delete mode 100644 ui/sdl_zoom_template.h delete mode 100644 ui/sdl.c delete mode 100644 ui/sdl_zoom.c -- 2.9.3

3 6

Re: [libvirt] [PATCH] vl.c: make sure maxcpus matches topology to prevent migration failure
by Eduardo Habkost 24 Aug '18

24 Aug '18

On Fri, Aug 24, 2018 at 01:26:54PM +0200, Igor Mammedov wrote: > On Fri, 24 Aug 2018 08:11:48 -0300 > Eduardo Habkost <ehabkost(a)redhat.com> wrote: > > > On Fri, Aug 24, 2018 at 11:13:50AM +0200, Igor Mammedov wrote: > > > On Thu, 23 Aug 2018 18:32:41 +0200 > > > Paolo Bonzini <pbonzini(a)redhat.com> wrote: > > > > > > > On 23/08/2018 16:51, Igor Mammedov wrote: > > > > > Topology (threads*cores*sockets) must match maxcpus to be valid, > > > > > otherwise we could start QEMU with invalid topology that throws > > > > > a error on migration destination side, that should not be reachable: > > > > > Source: > > > > > -smp 8,maxcpus=64,cores=1,threads=8,sockets=1 > > > > > // hotplug cpus upto maxcpus > > > > > Destination: > > > > > -smp 64,maxcpus=64,cores=1,threads=8,sockets=1 > > > > > qemu: cpu topology: sockets (1) * cores (1) * threads (8) < smp_cpus (64) > > > This destination CLI aren't exactly correct as well since > > > it should've been exactly the same -smp as on source + a bunch of -device cpufoo... > > > so we can always say go fix your CLI so it won't trigger error. > > > > > > > The destination should have sockets=8, shouldn't it? > > > either that or cores=8 or cores=4,sockets=2 ... > > > > > > > It seems to me that, at startup, you should have cpus = s*t*c and cpus > > > > <= maxcpus. Currently we check cpus <= s*t*c <= maxcpus, which doesn't > > > > make much sense. > > > I think that s*t*c should describe topology of whole machine > > > including not yet plugged vcpus. "cpus = s*t*c" probably won't work > > > for partially filled package case: > > > -smp 1,cores=1,threads=8,sockets=1 > > > cores/threads should reflect full package configuration > > > for guest to see an expected topology. > > > > Oh, now I remember: that's the reason we don't enforce > > s*t*c == smp_cpus nor s*t*c == max_cpus. > > > > Both "-smp 4,maxcpus=8,cores=2,threads=2,sockets=1" and > > "-smp 4,maxcpus=8,cores=2,threads=2,sockets=2" > > worked since maxcpus was introduced, making the semantics of > > "sockets" unclear and hard to change without breaking existing > > configs. > Should we go with deprication thingy then, > so we could make it clear in the future? Yes, but I'm not sure which option we should adopt (s*t*c == smp_cpus or s*t*c == max_cpus). Does anybody know what's the semantics expected by libvirt today? -- Eduardo

3 2

[libvirt] [PATCH v2 0/7] Introduce metadata locking
by Michal Privoznik 24 Aug '18

24 Aug '18

v2 of: https://www.redhat.com/archives/libvir-list/2018-August/msg00482.html diff to v1: - 1/6 from original patch set is replaced with different approach. As Dan suggested, virLockSpace accepts range to lock through its API and has new flag that tells it to wait for the lock to be acquired. Michal Prívozník (7): virlockspace: Allow caller to specify start and length offset in virLockSpaceAcquireResource virlockspace: Introduce VIR_LOCK_SPACE_ACQUIRE_WAIT lock_driver.h: Introduce metadata flag lockd_driver_lockd: Implement metadata flag lock_driver_sanlock: Handle metadata flag gracefully domain_lock: Implement metadata locking qemu_security: Lock metadata while relabelling src/libvirt_private.syms | 8 + src/locking/domain_lock.c | 304 ++++++++++++++++++++++++++++++++++--- src/locking/domain_lock.h | 28 ++++ src/locking/lock_daemon_dispatch.c | 13 +- src/locking/lock_driver.h | 2 + src/locking/lock_driver_lockd.c | 31 ++-- src/locking/lock_driver_lockd.h | 1 + src/locking/lock_driver_sanlock.c | 25 ++- src/qemu/qemu_security.c | 107 +++++++++++++ src/util/virlockspace.c | 25 ++- src/util/virlockspace.h | 5 + tests/virlockspacetest.c | 29 +++- 12 files changed, 525 insertions(+), 53 deletions(-) -- 2.16.4

5 44

[libvirt] [PATCH v2 00/10] qemu: Get rid of QEMU_CAPS_ADD_FD (and improve block-commit probing)
by Peter Krempa 24 Aug '18

24 Aug '18

Diff to v1: - stopped probing for active block-commit support when we can use QMP schema - qemuxml2argvmock's implementation of virCommandPassFD now passes through specific file descriptors and ignores the rest. Peter Krempa (10): qemu: qapi: Simplify value handling in virQEMUQAPISchemaTraverse qemu: qapi: Split up virQEMUQAPISchemaObjectGetType qemu: qapi: Allow selecting specifically optional schema entries in virQEMUQAPISchemaTraverse qemu: capabilities: Detect active block commit via QMP schema probing if possible FIXUP: regenerate ordering in replies files tests: qemuxml2argvmock: Allow 'safe' file descriptors in mocked virCommandPassFD qemu: command: Extract opening of TPM backend FDs for mocking purposes tests: qemuxml2argv: modernize TPM passthrough tests qemu: capabilities: Always assume QEMU_CAPS_ADD_FD FIXUP: regenerate ordering in replies files src/qemu/qemu_capabilities.c | 25 +-- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 69 ++++--- src/qemu/qemu_command.h | 7 + src/qemu/qemu_qapi.c | 84 ++++++-- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 169 +++++++--------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 169 +++++++--------- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 169 +++++++--------- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 169 +++++++--------- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 3 +- .../caps_2.10.0.aarch64.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 3 +- .../caps_2.10.0.x86_64.replies | 213 +++++++++---------- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 185 +++++++---------- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 +- .../caps_2.11.0.x86_64.replies | 213 +++++++++---------- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 3 +- .../caps_2.12.0.aarch64.replies | 189 +++++++---------- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 189 +++++++---------- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 193 ++++++++---------- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 +- .../caps_2.12.0.x86_64.replies | 225 +++++++++------------ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 181 ++++++++--------- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 197 ++++++++---------- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 +- .../caps_2.6.0.aarch64.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 197 ++++++++---------- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 173 +++++++--------- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 197 ++++++++---------- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 197 ++++++++---------- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 181 +++++++---------- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 213 +++++++++---------- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 189 +++++++---------- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 225 +++++++++------------ tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 3 +- tests/qemuxml2argvdata/tpm-passthrough-crb.args | 5 +- tests/qemuxml2argvdata/tpm-passthrough.args | 5 +- tests/qemuxml2argvmock.c | 38 +++- 64 files changed, 2415 insertions(+), 3204 deletions(-) -- 2.16.2

2 22

[libvirt] [PATCH 0/2] Allow usage of unpriv_sgio for SCSI generic hostdev
by John Ferlan 24 Aug '18

24 Aug '18

In what is perhaps a couple lifetimes ago at this point, patches were posted and "mostly" all eventually accepted upstream to support unpriv_sgio on SCSI generic hostdev devices. Since the needed parts of the functionality from the kernel perspective were not yet present upstream, a couple of the patches were not accepted. See: https://www.redhat.com/archives/libvir-list/2015-July/msg00204.html and in particular patches 9 and 10. Since that time it seems things have changed and this essentially reposts those two patches with some minor adjustments in logic in order to "restore" the support. There are lots of interesting tidbits in unreadable by the general public bz's, so I won't include links here. John Ferlan (2): qemu: Add ability to set sgio values for hostdev qemu: Add check for unpriv sgio for SCSI generic host device src/qemu/qemu_conf.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) -- 2.17.1

3 5

[libvirt] [PATCH v2] process: Ignore nwfilter binding instantiation issues during reconnect
by John Ferlan 24 Aug '18

24 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1607202 It's essentially stated in the nwfilterBindingDelete that we will allow the admin to shoot themselves in the foot by deleting the nwfilter binding which then allows them to undefine the nwfilter that is in use for the running guest... However, by allowing this we cause a problem for libvirtd restart reconnect processing which would then try to recreate the missing binding attempting to use the deleted filter resulting in an error and thus shutting the guest down. So rather than keep adding virDomainConfNWFilterInstantiate flags to "ignore" specific error conditions and since (so far) this is the only path that cared about checking if the filter already exists and ignoring, let's just ignore all errors and make the qemuProcessFiltersInstantiate be a void which will attempt to check all networks for bindings and reload all filters that exist. Using the VIR_INFO in order to at least "log" the avoided issue. This also means virDomainConfNWFilterInstantiate no longer needs to handle/check the ignoreExists possbility. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v1: https://www.redhat.com/archives/libvir-list/2018-August/msg01407.html Changes - removed the ignoreExists and just change the logic for reconnect processing to essentially ignore all errors. If it's felt the VIR_INFO would be too chatty (especially since it'll be generated for every already defined filter binding), I can remove it. Another option would be to keep the ignoreExists logic and only generate that VIR_INFO for "other" messages. In that case, I'd probably want to change it to a VIR_WARN. Still figured I'd post the remove it all option first for consideration with this caveat so that "option" can be considered as well. src/conf/domain_nwfilter.c | 15 +++------------ src/conf/domain_nwfilter.h | 3 +-- src/lxc/lxc_process.c | 2 +- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_interface.c | 4 ++-- src/qemu/qemu_process.c | 23 +++++++++++++++-------- src/uml/uml_conf.c | 2 +- 7 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c index f39c8a1f9b..51c9063ca7 100644 --- a/src/conf/domain_nwfilter.c +++ b/src/conf/domain_nwfilter.c @@ -84,8 +84,7 @@ virNWFilterBindingDefForNet(const char *vmname, int virDomainConfNWFilterInstantiate(const char *vmname, const unsigned char *vmuuid, - virDomainNetDefPtr net, - bool ignoreExists) + virDomainNetDefPtr net) { virConnectPtr conn = virGetConnectNWFilter(); virNWFilterBindingDefPtr def = NULL; @@ -93,20 +92,12 @@ virDomainConfNWFilterInstantiate(const char *vmname, char *xml = NULL; int ret = -1; - VIR_DEBUG("vmname=%s portdev=%s filter=%s ignoreExists=%d", - vmname, NULLSTR(net->ifname), NULLSTR(net->filter), ignoreExists); + VIR_DEBUG("vmname=%s portdev=%s filter=%s", + vmname, NULLSTR(net->ifname), NULLSTR(net->filter)); if (!conn) goto cleanup; - if (ignoreExists) { - binding = virNWFilterBindingLookupByPortDev(conn, net->ifname); - if (binding) { - ret = 0; - goto cleanup; - } - } - if (!(def = virNWFilterBindingDefForNet(vmname, vmuuid, net))) goto cleanup; diff --git a/src/conf/domain_nwfilter.h b/src/conf/domain_nwfilter.h index 6bda228fc8..d2ebeff853 100644 --- a/src/conf/domain_nwfilter.h +++ b/src/conf/domain_nwfilter.h @@ -25,8 +25,7 @@ int virDomainConfNWFilterInstantiate(const char *vmname, const unsigned char *vmuuid, - virDomainNetDefPtr net, - bool ignoreExists); + virDomainNetDefPtr net); void virDomainConfNWFilterTeardown(virDomainNetDefPtr net); void virDomainConfVMNWFilterTeardown(virDomainObjPtr vm); diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 33c806630b..86f7463e53 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -303,7 +303,7 @@ virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, } if (net->filter && - virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) < 0) + virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net) < 0) goto cleanup; ret = containerVeth; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0b84a503bb..38c74bd9b1 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3435,7 +3435,7 @@ qemuDomainChangeNetFilter(virDomainObjPtr vm, if (newdev->filter && virDomainConfNWFilterInstantiate(vm->def->name, - vm->def->uuid, newdev, false) < 0) { + vm->def->uuid, newdev) < 0) { virErrorPtr errobj; virReportError(VIR_ERR_OPERATION_FAILED, @@ -3444,7 +3444,7 @@ qemuDomainChangeNetFilter(virDomainObjPtr vm, olddev->ifname); virErrorPreserveLast(&errobj); ignore_value(virDomainConfNWFilterInstantiate(vm->def->name, - vm->def->uuid, olddev, false)); + vm->def->uuid, olddev)); virErrorRestore(&errobj); return -1; } diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index a3f13093f5..5d54a85c53 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -467,7 +467,7 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def, goto cleanup; if (net->filter && - virDomainConfNWFilterInstantiate(def->name, def->uuid, net, false) < 0) { + virDomainConfNWFilterInstantiate(def->name, def->uuid, net) < 0) { goto cleanup; } @@ -586,7 +586,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def, goto cleanup; if (net->filter && - virDomainConfNWFilterInstantiate(def->name, def->uuid, net, false) < 0) { + virDomainConfNWFilterInstantiate(def->name, def->uuid, net) < 0) { goto cleanup; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ab749389ee..48d9bab128 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3160,22 +3160,30 @@ qemuProcessNotifyNets(virDomainDefPtr def) } } -static int -qemuProcessFiltersInstantiate(virDomainDefPtr def, bool ignoreExists) + +/* Attempt to instantiate the filters. Ignore failures because it's + * (primarily) possible that a filter binding either already exists + * or someone deleted it and the associated filter while the guest + * was running and we don't want that action to cause failure to + * keep the guest running during the reconnection processing. */ +static void +qemuProcessFiltersInstantiate(virDomainDefPtr def) { size_t i; for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; if ((net->filter) && (net->ifname)) { - if (virDomainConfNWFilterInstantiate(def->name, def->uuid, net, ignoreExists) < 0) - return 1; + if (virDomainConfNWFilterInstantiate(def->name, def->uuid, net) < 0) { + VIR_INFO("filter '%s' instantiation for '%s' failed '%s'", + net->filter, net->ifname, virGetLastErrorMessage()); + virResetLastError(); + } } } - - return 0; } + static int qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm) { @@ -7892,8 +7900,7 @@ qemuProcessReconnect(void *opaque) qemuProcessNotifyNets(obj->def); - if (qemuProcessFiltersInstantiate(obj->def, true)) - goto error; + qemuProcessFiltersInstantiate(obj->def); if (qemuProcessRefreshDisks(driver, obj, QEMU_ASYNC_JOB_NONE) < 0) goto error; diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index f116e619ef..9c548f0e80 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -137,7 +137,7 @@ umlConnectTapDevice(virDomainDefPtr vm, } if (net->filter) { - if (virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) < 0) { + if (virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net) < 0) { if (template_ifname) VIR_FREE(net->ifname); goto error; -- 2.17.1

2 4

[libvirt] [PATCH v3] qemu: qemuDomainChangeNet: validity checks should be done before XML autocompletion
by Katerina Koukiou 24 Aug '18

24 Aug '18

This patch ensures that changes in attributes of interfaces will be emit errors accept if they are missing from the XML. Previously we were falsely reporting successful updates, because some changed attributes got overwritten before the validity checks. https://bugzilla.redhat.com/show_bug.cgi?id=1599513 Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- Changes from v2: * Added check for type element in info struct. * Moved the addr checks at start the the section with info checks. src/qemu/qemu_hotplug.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0b84a503bb..f9805627b7 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3598,16 +3598,22 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, goto cleanup; } - /* info: if newdev->info is empty, fill it in from olddev, - * otherwise verify that it matches - nothing is allowed to - * change. (There is no helper function to do this, so - * individually check the few feidls of virDomainDeviceInfo that - * are relevant in this case). + /* info: Nothing is allowed to change. First fill the missing newdev->info + * from olddev and then check for changes. */ + + /* if addr type is missing overwrite if from olddev */ + if (newdev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + newdev->info.type = olddev->info.type; + if (olddev->info.type != newdev->info.type) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot modify network device type")); + } + + /* if pci addr is missing or is invalid we overwrite it from olddev */ if (!virDomainDeviceAddressIsValid(&newdev->info, - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && - virDomainDeviceInfoCopy(&newdev->info, &olddev->info) < 0) { - goto cleanup; + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) { + newdev->info.addr.pci = olddev->info.addr.pci; } if (!virPCIDeviceAddressEqual(&olddev->info.addr.pci, &newdev->info.addr.pci)) { @@ -3622,21 +3628,33 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, /* device alias is checked already in virDomainDefCompatibleDevice */ + if (newdev->info.rombar == VIR_TRISTATE_BOOL_ABSENT) + newdev->info.rombar = olddev->info.rombar; if (olddev->info.rombar != newdev->info.rombar) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device rom bar setting")); goto cleanup; } + + if (!newdev->info.romfile && + VIR_STRDUP(newdev->info.romfile, olddev->info.romfile) < 0) + goto cleanup; if (STRNEQ_NULLABLE(olddev->info.romfile, newdev->info.romfile)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network rom file")); goto cleanup; } + + if (newdev->info.bootIndex == 0) + newdev->info.bootIndex = olddev->info.bootIndex; if (olddev->info.bootIndex != newdev->info.bootIndex) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device boot index setting")); goto cleanup; } + + if (newdev->info.romenabled == VIR_TRISTATE_BOOL_ABSENT) + newdev->info.romenabled = olddev->info.romenabled; if (olddev->info.romenabled != newdev->info.romenabled) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device rom enabled setting")); -- 2.17.1

2 1

[libvirt] [jenkins-ci PATCH v3 00/12] lcitool: Add 'build' action
by Andrea Bolognani 24 Aug '18

24 Aug '18

Changes from [v2]: * rebase on top of master (dbc2de85f775) and integrate recent changes to build rules on the Jenkins side; * drop a commit that had already been merged in the meantime. Changes from [v1]: * rebase on top of master (985ab833be9b) and integrate recent changes to build rules on the Jenkins side; * build on more targets. [v2] https://www.redhat.com/archives/libvir-list/2018-August/msg01109.html [v1] https://www.redhat.com/archives/libvir-list/2018-August/msg00393.html Andrea Bolognani (12): jobs: Rename git-url -> git_url jobs: Remove archive_format from defaults jobs: Move some parameters from jobs to defaults jobs: Declare empty values consistently guests: Add build jobs guests: Add build projects guests: Add build playbook lcitool: Make playbook execution generic lcitool: Add 'build' action lcitool: Support building arbitrary branches guests: Support building on more targets lcitool: Document build action guests/README.markdown | 19 +++ guests/lcitool | 109 ++++++++++-------- .../build/jobs/autotools-build-job.yml | 15 +++ .../build/jobs/autotools-check-job.yml | 16 +++ .../build/jobs/autotools-rpm-job.yml | 15 +++ .../build/jobs/autotools-syntax-check-job.yml | 12 ++ guests/playbooks/build/jobs/defaults.yml | 42 +++++++ .../build/jobs/generic-build-job.yml | 11 ++ .../build/jobs/generic-check-job.yml | 11 ++ .../playbooks/build/jobs/generic-rpm-job.yml | 11 ++ .../build/jobs/generic-syntax-check-job.yml | 11 ++ guests/playbooks/build/jobs/go-build-job.yml | 11 ++ guests/playbooks/build/jobs/go-check-job.yml | 11 ++ .../build/jobs/perl-modulebuild-build-job.yml | 13 +++ .../build/jobs/perl-modulebuild-check-job.yml | 11 ++ .../build/jobs/perl-modulebuild-rpm-job.yml | 14 +++ guests/playbooks/build/jobs/prepare.yml | 19 +++ .../build/jobs/python-distutils-build-job.yml | 13 +++ .../build/jobs/python-distutils-check-job.yml | 11 ++ .../build/jobs/python-distutils-rpm-job.yml | 14 +++ guests/playbooks/build/main.yml | 16 +++ guests/playbooks/build/projects/libosinfo.yml | 36 ++++++ .../playbooks/build/projects/libvirt-cim.yml | 10 ++ .../playbooks/build/projects/libvirt-dbus.yml | 52 +++++++++ .../playbooks/build/projects/libvirt-glib.yml | 38 ++++++ .../build/projects/libvirt-go-xml.yml | 13 +++ .../playbooks/build/projects/libvirt-go.yml | 13 +++ .../playbooks/build/projects/libvirt-perl.yml | 19 +++ .../build/projects/libvirt-python.yml | 13 +++ .../build/projects/libvirt-sandbox.yml | 30 +++++ .../playbooks/build/projects/libvirt-tck.yml | 27 +++++ guests/playbooks/build/projects/libvirt.yml | 57 +++++++++ .../build/projects/osinfo-db-tools.yml | 36 ++++++ guests/playbooks/build/projects/osinfo-db.yml | 23 ++++ .../playbooks/build/projects/virt-manager.yml | 42 +++++++ .../playbooks/build/projects/virt-viewer.yml | 40 +++++++ jobs/autotools.yaml | 3 +- jobs/defaults.yaml | 8 +- jobs/generic.yaml | 3 +- jobs/go.yaml | 3 +- jobs/perl-modulebuild.yaml | 3 +- jobs/python-distutils.yaml | 3 +- projects/libosinfo.yaml | 3 +- projects/libvirt-cim.yaml | 3 +- projects/libvirt-dbus.yaml | 8 +- projects/libvirt-glib.yaml | 3 +- projects/libvirt-go-xml.yaml | 3 +- projects/libvirt-go.yaml | 3 +- projects/libvirt-perl.yaml | 3 +- projects/libvirt-python.yaml | 3 +- projects/libvirt-sandbox.yaml | 3 +- projects/libvirt-tck.yaml | 3 +- projects/libvirt.yaml | 2 +- projects/osinfo-db-tools.yaml | 3 +- projects/osinfo-db.yaml | 2 +- projects/virt-manager.yaml | 7 +- projects/virt-viewer.yaml | 3 +- 57 files changed, 852 insertions(+), 77 deletions(-) create mode 100644 guests/playbooks/build/jobs/autotools-build-job.yml create mode 100644 guests/playbooks/build/jobs/autotools-check-job.yml create mode 100644 guests/playbooks/build/jobs/autotools-rpm-job.yml create mode 100644 guests/playbooks/build/jobs/autotools-syntax-check-job.yml create mode 100644 guests/playbooks/build/jobs/defaults.yml create mode 100644 guests/playbooks/build/jobs/generic-build-job.yml create mode 100644 guests/playbooks/build/jobs/generic-check-job.yml create mode 100644 guests/playbooks/build/jobs/generic-rpm-job.yml create mode 100644 guests/playbooks/build/jobs/generic-syntax-check-job.yml create mode 100644 guests/playbooks/build/jobs/go-build-job.yml create mode 100644 guests/playbooks/build/jobs/go-check-job.yml create mode 100644 guests/playbooks/build/jobs/perl-modulebuild-build-job.yml create mode 100644 guests/playbooks/build/jobs/perl-modulebuild-check-job.yml create mode 100644 guests/playbooks/build/jobs/perl-modulebuild-rpm-job.yml create mode 100644 guests/playbooks/build/jobs/prepare.yml create mode 100644 guests/playbooks/build/jobs/python-distutils-build-job.yml create mode 100644 guests/playbooks/build/jobs/python-distutils-check-job.yml create mode 100644 guests/playbooks/build/jobs/python-distutils-rpm-job.yml create mode 100644 guests/playbooks/build/main.yml create mode 100644 guests/playbooks/build/projects/libosinfo.yml create mode 100644 guests/playbooks/build/projects/libvirt-cim.yml create mode 100644 guests/playbooks/build/projects/libvirt-dbus.yml create mode 100644 guests/playbooks/build/projects/libvirt-glib.yml create mode 100644 guests/playbooks/build/projects/libvirt-go-xml.yml create mode 100644 guests/playbooks/build/projects/libvirt-go.yml create mode 100644 guests/playbooks/build/projects/libvirt-perl.yml create mode 100644 guests/playbooks/build/projects/libvirt-python.yml create mode 100644 guests/playbooks/build/projects/libvirt-sandbox.yml create mode 100644 guests/playbooks/build/projects/libvirt-tck.yml create mode 100644 guests/playbooks/build/projects/libvirt.yml create mode 100644 guests/playbooks/build/projects/osinfo-db-tools.yml create mode 100644 guests/playbooks/build/projects/osinfo-db.yml create mode 100644 guests/playbooks/build/projects/virt-manager.yml create mode 100644 guests/playbooks/build/projects/virt-viewer.yml -- 2.17.1

2 32

Re: [libvirt] [PATCH v3 8/9] tests: Add RISC-V architectures
by Andrea Bolognani 24 Aug '18

24 Aug '18

On Wed, 2018-08-22 at 11:15 +0200, Lubomir Rintel wrote: > Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk> > --- > tests/capabilityschemadata/caps-qemu-kvm.xml | 36 + > .../caps_3.0.0.riscv32.replies | 14819 ++++++++++++++++ > .../caps_3.0.0.riscv32.xml | 118 + > .../caps_3.0.0.riscv64.replies | 14819 ++++++++++++++++ > .../caps_3.0.0.riscv64.xml | 118 + > tests/qemucapabilitiestest.c | 2 + > tests/qemuxml2argvdata/riscv64-virt.args | 30 + > tests/qemuxml2argvdata/riscv64-virt.xml | 32 + > tests/qemuxml2argvtest.c | 3 + > .../riscv64-virt.xml | 42 + > tests/qemuxml2xmloutdata/riscv64-virt.xml | 36 + > tests/qemuxml2xmltest.c | 2 + > tests/testutilsqemu.c | 72 + > tests/vircapstest.c | 6 + > 14 files changed, 30135 insertions(+) > create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies > create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml > create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies > create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml > create mode 100644 tests/qemuxml2argvdata/riscv64-virt.args > create mode 100644 tests/qemuxml2argvdata/riscv64-virt.xml > create mode 100644 tests/qemuxml2startupxmloutdata/riscv64-virt.xml > create mode 100644 tests/qemuxml2xmloutdata/riscv64-virt.xml I think I didn't explain myself clearly enough while reviewing v2: I expected patches 07-09 and 11 to be squashed together, but patch 10 to remain standalone. No big deal, I'll take care of splitting it up again myself. [...] > +++ b/tests/qemuxml2argvdata/riscv64-virt.xml > @@ -0,0 +1,32 @@ > +<domain type='qemu'> > + <name>riscv64</name> > + <uuid>fd65fc03-8838-4c4d-9d8d-395802488790</uuid> > + <memory unit='KiB'>2097152</memory> > + <currentMemory unit='KiB'>2097152</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='riscv64' machine='virt'>hvm</type> > + <kernel>/var/lib/libvirt/images/bbl</kernel> > + <cmdline>console=ttyS0 ro root=/dev/vda</cmdline> > + <boot dev='hd'/> > + </os> > + <clock offset='utc'/> > + <on_poweroff>destroy</on_poweroff> > + <on_reboot>restart</on_reboot> > + <on_crash>destroy</on_crash> > + <devices> > + <emulator>/usr/bin/qemu-system-riscv64</emulator> > + <disk type='file' device='disk'> > + <driver name='qemu' type='raw'/> > + <source file='/var/lib/libvirt/images/stage4-disk.img'/> > + <target dev='vda' bus='virtio'/> > + <address type='virtio-mmio'/> > + </disk> > + <serial type='pty'> > + <target port='0'/> > + </serial> > + <console type='pty'> > + <target type='serial' port='0'/> > + </console> > + </devices> > +</domain> You didn't minimize the input file like I requested during review :( Oh well, I'll take care of it. Reviewed-by: Andrea Bolognani <abologna(a)redhat.com> [...] > +static int testQemuAddRISCV32Guest(virCapsPtr caps) > +{ > + static const char *names[] = { "spike_v1.10", > + "spike_v1.9.1", > + "sifive_e", > + "virt", > + "sifive_u" }; > + static const int nmachines = ARRAY_CARDINALITY(names); > + virCapsGuestMachinePtr *machines = NULL; > + virCapsGuestPtr guest; > + > + machines = virCapabilitiesAllocMachines(names, nmachines); > + if (!machines) > + goto error; > + > + guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_RISCV32, > + QEMUBinList[TEST_UTILS_QEMU_BIN_RISCV32], > + NULL, nmachines, machines); > + if (!guest) > + goto error; > + > + if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU, NULL, NULL, 0, NULL)) > + goto error; > + > + return 0; > + > + error: > + virCapabilitiesFreeMachines(machines, nmachines); > + return -1; > +} > + > +static int testQemuAddRISCV64Guest(virCapsPtr caps) > +{ > + static const char *names[] = { "spike_v1.10", > + "spike_v1.9.1", > + "sifive_e", > + "virt", > + "sifive_u" }; > + static const int nmachines = ARRAY_CARDINALITY(names); > + virCapsGuestMachinePtr *machines = NULL; > + virCapsGuestPtr guest; > + > + machines = virCapabilitiesAllocMachines(names, nmachines); > + if (!machines) > + goto error; > + > + guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_RISCV64, > + QEMUBinList[TEST_UTILS_QEMU_BIN_RISCV64], > + NULL, nmachines, machines); > + if (!guest) > + goto error; > + > + if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU, NULL, NULL, 0, NULL)) > + goto error; > + > + return 0; > + > + error: > + virCapabilitiesFreeMachines(machines, nmachines); > + return -1; > +} > + > static int testQemuAddS390Guest(virCapsPtr caps) > { > static const char *s390_machines[] = { "s390-virtio", > @@ -440,6 +506,12 @@ virCapsPtr testQemuCapsInit(void) > if (testQemuAddPPCGuest(caps)) > goto cleanup; > > + if (testQemuAddRISCV32Guest(caps) < 0) > + goto cleanup; > + > + if (testQemuAddRISCV64Guest(caps) < 0) > + goto cleanup; > + > if (testQemuAddS390Guest(caps)) > goto cleanup; > And of course I didn't clean up the surrounding code even though I said I would... This is a good reminder I guess :) -- Andrea Bolognani / Red Hat / Virtualization

1 1

[libvirt] [PATCH 0/8] qemu: monitor: Clean up error handling for block job APIs
by Peter Krempa 24 Aug '18

24 Aug '18

Remove handling of errors which QEMU no longer reports and rename fields so that it conforms with the new semantics. Peter Krempa (8): qemu: monitor: Remove error classes not conforming to QAPI schema qemu: monitor: Use qemuMonitorJSONCheckError in qemuMonitorJSONBlockJobError qemu: monitor: Remove temporary variables qemu: monitor: Use qemuMonitorJSONCheckError in qemuMonitorJSONBlockStream qemu: monitor: Move qemuMonitorJSONDrivePivot together with block-job APIs qemu: monitor: Use qemuMonitorJSONBlockJobError in qemuMonitorJSONDrivePivot qemu: monitor: Rename 'device' argument for block job control APIs qemu: monitor: Separate probing for active block commit src/qemu/qemu_monitor.c | 20 +++--- src/qemu/qemu_monitor.h | 6 +- src/qemu/qemu_monitor_json.c | 155 +++++++++++++++++++++---------------------- src/qemu/qemu_monitor_json.h | 9 ++- 4 files changed, 94 insertions(+), 96 deletions(-) -- 2.16.2

2 19

[libvirt] [PATCH 0/2] Add nodesevinfo in virsh
by Han Han 24 Aug '18

24 Aug '18

Add virsh nodesevinfo to get AMD SEV features via virNodeGetSEVInfo. Han Han (2): virsh: Implement virNodeGetSEVInfo in virsh news: Add nodesevinfo command in virsh docs/news.xml | 9 +++++++ tools/virsh-host.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 5 ++++ 3 files changed, 80 insertions(+) -- 2.18.0

2 3

[libvirt] [PATCH] storage: Add --shrink to qemu-img command when shrinking vol
by John Ferlan 24 Aug '18

24 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1613746 When shrinking the capacity of a qcow2 or luks volume using the qemu-img program, the --shrink qualifier must be added. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 42a9b6abf0..c936120bf0 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2294,12 +2294,12 @@ storageBackendResizeQemuImg(virStoragePoolObjPtr pool, * a multiple of 512 */ capacity = VIR_ROUND_UP(capacity, 512); - cmd = virCommandNew(img_tool); + cmd = virCommandNewArgList(img_tool, "resize", NULL); + if (capacity < vol->target.capacity) + virCommandAddArg(cmd, "--shrink"); if (!vol->target.encryption) { - virCommandAddArgList(cmd, "resize", vol->target.path, NULL); + virCommandAddArg(cmd, vol->target.path); } else { - virCommandAddArg(cmd, "resize"); - if (storageBackendCreateQemuImgSecretObject(cmd, secretPath, secretAlias) < 0) goto cleanup; -- 2.17.1

2 1

[libvirt] [PATCH] nwfilter: Handle opening for session
by John Ferlan 24 Aug '18

24 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1608275 Commit id 2870419eb (in part) added virGetConnectNWFilter to allow opening drivers (interface, network, nwfilter, nodedev, secret, and storage) based on context and commit id f14c37ce4c started using the API; however, the nwfilterConnectOpen did not handle session mode resulting in the following message being logged when virDomainConfVMNWFilterTeardown was called during the domain shutdown processing: error : nwfilterConnectOpen:383 : internal error: unexpected nwfilter URI path '/session', try nwfilter:///system So similar to the other drivers add code in to check for /session when not privileged. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/nwfilter/nwfilter_driver.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index ac3a964388..6c25293fd9 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -377,11 +377,20 @@ nwfilterConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_ERROR; } - if (STRNEQ(conn->uri->path, "/system")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected nwfilter URI path '%s', try nwfilter:///system"), - conn->uri->path); - return VIR_DRV_OPEN_ERROR; + if (driver->privileged) { + if (STRNEQ(conn->uri->path, "/system")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected nwfilter URI path '%s', try nwfilter:///system"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + } else { + if (STRNEQ(conn->uri->path, "/session")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected nwfilter URI path '%s', try nwfilter:///session"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } } if (virConnectOpenEnsureACL(conn) < 0) -- 2.17.1

2 1

[libvirt] [PATCH] nwfilter: Add extra verbiage for binding create/delete
by John Ferlan 24 Aug '18

24 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1609454 Add some cautionary words related to the create and delete NWFilter Binding use cases and possible issues that may result to the virsh nwfilter-binding-{create|delete} descriptions and the virNWFilterBinding{CreateXML|Delete) API descriptions. Essentially summarizing commit 2d9318b6c without using the shoot yourself in the foot wording. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Perhaps not the exact "answer" for the bz; however, using the bz as the excuse to say it was a bit confusing and let's try to clarify the wording a bit more. src/libvirt-nwfilter.c | 16 ++++++++++++++-- tools/virsh.pod | 14 ++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/libvirt-nwfilter.c b/src/libvirt-nwfilter.c index e572d46c18..3da85adc9e 100644 --- a/src/libvirt-nwfilter.c +++ b/src/libvirt-nwfilter.c @@ -678,7 +678,14 @@ virNWFilterBindingGetFilterName(virNWFilterBindingPtr binding) * @flags: currently unused, pass 0 * * Define a new network filter, based on an XML description - * similar to the one returned by virNWFilterGetXMLDesc() + * similar to the one returned by virNWFilterGetXMLDesc(). This + * API may be used to associate a filter with a currently running + * guest that does not have a filter defined for a specific network + * port. Since the bindings are generally automatically managed by + * the hypervisor, using this command to define a filter for a network + * port and then starting the guest afterwards may prevent the guest + * from starting if it attempts to use the network port and finds a + * filter already defined. * * virNWFilterFree should be used to free the resources after the * binding object is no longer needed. @@ -717,7 +724,12 @@ virNWFilterBindingCreateXML(virConnectPtr conn, const char *xml, unsigned int fl * @binding: a binding object * * Delete the binding object. This does not free the - * associated virNWFilterBindingPtr object. + * associated virNWFilterBindingPtr object. This API + * may be used to remove the network port binding filter + * currently in use for the guest while the guest is + * running without needing to restart the guest. Restoring + * the network port binding filter for the running guest + * would be accomplished by using virNWFilterBindingCreateXML. * * Returns 0 in case of success and -1 in case of failure. */ diff --git a/tools/virsh.pod b/tools/virsh.pod index 4e118851f8..86c041d575 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -4836,13 +4836,23 @@ of the network filters directly. =item B<nwfilter-binding-create> I<xmlfile> Associate a network port with a network filter. The network filter backend -will immediately attempt to instantiate the filter rules on the port. +will immediately attempt to instantiate the filter rules on the port. This +command may be used to associate a filter with a currently running guest +that does not have a filter defined for a specific network port. Since the +bindings are generally automatically managed by the hypervisor, using this +command to define a filter for a network port and then starting the guest +afterwards may prevent the guest from starting if it attempts to use the +network port and finds a filter already defined. =item B<nwfilter-binding-delete> I<port-name> Disassociate a network port from a network filter. The network filter backend will immediately tear down the filter rules that exist on the -port. +port. This command may be used to remove the network port binding for +a filter currently in use for the guest while the guest is running +without needing to restart the guest. Restoring the network port binding +filter for the running guest would be accomplished by using +I<nwfilter-binding-create>. =item B<nwfilter-binding-list> -- 2.17.1

2 1

[libvirt] [PATCH] access: Fix nwfilter-binding ACL access API name generation
by John Ferlan 24 Aug '18

24 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1611320 Generation of the ACL API policy is a "automated process" based on this perl script which "worked" with the changes to add nwfilter binding API's because they had the "nwfilter" prefix; however, the generated output name was incorrect based on the remote protocol algorithm which expected to generate names such as 'nwfilter-binding.action' instead of 'nwfilter.binding-action'. This effectively changes src/access/org.libvirt.api.policy entries: org.libvirt.api.nwfilter.binding-create ==> org.libvirt.api.nwfilter-binding.create org.libvirt.api.nwfilter.binding-delete ==> org.libvirt.api.nwfilter-binding.delete org.libvirt.api.nwfilter.binding-getattr ==> org.libvirt.api.nwfilter-binding.getattr org.libvirt.api.nwfilter.binding-read ==> org.libvirt.api.nwfilter-binding.read Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- If someone can explain better exactly what is happening in this processing, I'd be more than willing to update the commit message. I'm sure my wording isn't "precise" enough, but I feel like I hit the lottery finding this needle in the haystack. src/access/genpolkit.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/access/genpolkit.pl b/src/access/genpolkit.pl index 968cb8c55c..e074c90eb6 100755 --- a/src/access/genpolkit.pl +++ b/src/access/genpolkit.pl @@ -22,8 +22,8 @@ use warnings; my @objects = ( "CONNECT", "DOMAIN", "INTERFACE", - "NETWORK","NODE_DEVICE", "NWFILTER", - "SECRET", "STORAGE_POOL", "STORAGE_VOL", + "NETWORK","NODE_DEVICE", "NWFILTER_BINDING", "NWFILTER", + "SECRET", "STORAGE_POOL", "STORAGE_VOL", ); my $objects = join ("|", @objects); -- 2.17.1

2 1

[libvirt] [PATCH] nwfilter: Handle libvirtd restart if nwfilter binding deleted
by John Ferlan 24 Aug '18

24 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1607202 It's stated that if the admin wants to shoot themselves in the foot by removing the nwfilter binding while the domain is running we will certainly allow that. However, in doing so we also run the risk that a libvirtd restart will cause the domain to be shutdown, which isn't a good thing. So add another boolean to virDomainConfNWFilterInstantiate which allows us to recover somewhat gracefully in the event the virNWFilterBindingCreateXML fails when we come from qemuProcessReconnect and we determine that the filter has been deleted. It was there at some point (it had to be), but if it's missing, then we don't want to cause the guest to stop running, so issue a warning and continue on. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/conf/domain_nwfilter.c | 33 ++++++++++++++++++++++++++++----- src/conf/domain_nwfilter.h | 3 ++- src/lxc/lxc_process.c | 3 ++- src/qemu/qemu_hotplug.c | 7 ++++--- src/qemu/qemu_interface.c | 6 ++++-- src/qemu/qemu_process.c | 10 +++++++--- src/uml/uml_conf.c | 3 ++- 7 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c index f39c8a1f9b..3e6e462def 100644 --- a/src/conf/domain_nwfilter.c +++ b/src/conf/domain_nwfilter.c @@ -85,16 +85,19 @@ int virDomainConfNWFilterInstantiate(const char *vmname, const unsigned char *vmuuid, virDomainNetDefPtr net, - bool ignoreExists) + bool ignoreExists, + bool ignoreDeleted) { virConnectPtr conn = virGetConnectNWFilter(); virNWFilterBindingDefPtr def = NULL; virNWFilterBindingPtr binding = NULL; + virNWFilterPtr nwfilter = NULL; char *xml = NULL; int ret = -1; - VIR_DEBUG("vmname=%s portdev=%s filter=%s ignoreExists=%d", - vmname, NULLSTR(net->ifname), NULLSTR(net->filter), ignoreExists); + VIR_DEBUG("vmname=%s portdev=%s filter=%s ignoreExists=%d ignoreDeleted=%d", + vmname, NULLSTR(net->ifname), NULLSTR(net->filter), + ignoreExists, ignoreDeleted); if (!conn) goto cleanup; @@ -113,14 +116,34 @@ virDomainConfNWFilterInstantiate(const char *vmname, if (!(xml = virNWFilterBindingDefFormat(def))) goto cleanup; - if (!(binding = virNWFilterBindingCreateXML(conn, xml, 0))) - goto cleanup; + if (!(binding = virNWFilterBindingCreateXML(conn, xml, 0))) { + virErrorPtr orig_err; + + if (!ignoreDeleted) + goto cleanup; + + /* Let's determine if the error was because the filter was deleted. + * Save the orig_err just in case it's not a failure to find the + * filter by name. */ + orig_err = virSaveLastError(); + nwfilter = virNWFilterLookupByName(conn, def->filter); + virSetError(orig_err); + virFreeError(orig_err); + if (nwfilter) + goto cleanup; + + VIR_WARN("filter '%s' for binding '%s' has been deleted while the " + "guest was running, ignoring for restart processing", + def->filter, def->portdevname); + virResetLastError(); + } ret = 0; cleanup: VIR_FREE(xml); virNWFilterBindingDefFree(def); + virObjectUnref(nwfilter); virObjectUnref(binding); virObjectUnref(conn); return ret; diff --git a/src/conf/domain_nwfilter.h b/src/conf/domain_nwfilter.h index 6bda228fc8..e3a2f7a7f2 100644 --- a/src/conf/domain_nwfilter.h +++ b/src/conf/domain_nwfilter.h @@ -26,7 +26,8 @@ int virDomainConfNWFilterInstantiate(const char *vmname, const unsigned char *vmuuid, virDomainNetDefPtr net, - bool ignoreExists); + bool ignoreExists, + bool ignoreDeleted); void virDomainConfNWFilterTeardown(virDomainNetDefPtr net); void virDomainConfVMNWFilterTeardown(virDomainObjPtr vm); diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 33c806630b..b8b014ca72 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -303,7 +303,8 @@ virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, } if (net->filter && - virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) < 0) + virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, + false, false) < 0) goto cleanup; ret = containerVeth; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0b84a503bb..11b10cbe14 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3434,8 +3434,8 @@ qemuDomainChangeNetFilter(virDomainObjPtr vm, virDomainConfNWFilterTeardown(olddev); if (newdev->filter && - virDomainConfNWFilterInstantiate(vm->def->name, - vm->def->uuid, newdev, false) < 0) { + virDomainConfNWFilterInstantiate(vm->def->name, vm->def->uuid, newdev, + false, false) < 0) { virErrorPtr errobj; virReportError(VIR_ERR_OPERATION_FAILED, @@ -3444,7 +3444,8 @@ qemuDomainChangeNetFilter(virDomainObjPtr vm, olddev->ifname); virErrorPreserveLast(&errobj); ignore_value(virDomainConfNWFilterInstantiate(vm->def->name, - vm->def->uuid, olddev, false)); + vm->def->uuid, olddev, + false, false)); virErrorRestore(&errobj); return -1; } diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index a3f13093f5..fc5f39b76d 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -467,7 +467,8 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def, goto cleanup; if (net->filter && - virDomainConfNWFilterInstantiate(def->name, def->uuid, net, false) < 0) { + virDomainConfNWFilterInstantiate(def->name, def->uuid, net, + false, false) < 0) { goto cleanup; } @@ -586,7 +587,8 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def, goto cleanup; if (net->filter && - virDomainConfNWFilterInstantiate(def->name, def->uuid, net, false) < 0) { + virDomainConfNWFilterInstantiate(def->name, def->uuid, net, + false, false) < 0) { goto cleanup; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ab749389ee..4d8b3017b4 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3161,14 +3161,18 @@ qemuProcessNotifyNets(virDomainDefPtr def) } static int -qemuProcessFiltersInstantiate(virDomainDefPtr def, bool ignoreExists) +qemuProcessFiltersInstantiate(virDomainDefPtr def, + bool ignoreExists, + bool ignoreDeleted) { size_t i; for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; if ((net->filter) && (net->ifname)) { - if (virDomainConfNWFilterInstantiate(def->name, def->uuid, net, ignoreExists) < 0) + if (virDomainConfNWFilterInstantiate(def->name, def->uuid, net, + ignoreExists, + ignoreDeleted) < 0) return 1; } } @@ -7892,7 +7896,7 @@ qemuProcessReconnect(void *opaque) qemuProcessNotifyNets(obj->def); - if (qemuProcessFiltersInstantiate(obj->def, true)) + if (qemuProcessFiltersInstantiate(obj->def, true, true)) goto error; if (qemuProcessRefreshDisks(driver, obj, QEMU_ASYNC_JOB_NONE) < 0) diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index f116e619ef..29d26848f3 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -137,7 +137,8 @@ umlConnectTapDevice(virDomainDefPtr vm, } if (net->filter) { - if (virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) < 0) { + if (virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, + false, false) < 0) { if (template_ifname) VIR_FREE(net->ifname); goto error; -- 2.17.1

2 5

[libvirt] [PATCH v2] qemu: qemuDomainChangeNet: validity checks should be done before XML autocompletion
by Katerina Koukiou 24 Aug '18

24 Aug '18

This patch ensures that changes in attributes of interfaces will be emit errors accept if they are missing from the XML. Previously we were falsely reporting successfull updates, because some changed attributes got overwritten before the validity checks. https://bugzilla.redhat.com/show_bug.cgi?id=1599513 Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- src/qemu/qemu_hotplug.c | 42 +++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1488f0a7c2..76ab56a479 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3445,23 +3445,9 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, goto cleanup; } - /* info: if newdev->info is empty, fill it in from olddev, - * otherwise verify that it matches - nothing is allowed to - * change. (There is no helper function to do this, so - * individually check the few feidls of virDomainDeviceInfo that - * are relevant in this case). + /* info: Nothing is allowed to change. First fill the missing newdev->info + * from olddev and then check for changes. */ - if (!virDomainDeviceAddressIsValid(&newdev->info, - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && - virDomainDeviceInfoCopy(&newdev->info, &olddev->info) < 0) { - goto cleanup; - } - if (!virPCIDeviceAddressEqual(&olddev->info.addr.pci, - &newdev->info.addr.pci)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("cannot modify network device guest PCI address")); - goto cleanup; - } /* grab alias from olddev if not set in newdev */ if (!newdev->info.alias && VIR_STRDUP(newdev->info.alias, olddev->info.alias) < 0) @@ -3469,26 +3455,50 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, /* device alias is checked already in virDomainDefCompatibleDevice */ + if (newdev->info.rombar == VIR_TRISTATE_BOOL_ABSENT) + newdev->info.rombar = olddev->info.rombar; if (olddev->info.rombar != newdev->info.rombar) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device rom bar setting")); goto cleanup; } + + if (!newdev->info.romfile && + VIR_STRDUP(newdev->info.romfile, olddev->info.romfile) < 0) + goto cleanup; if (STRNEQ_NULLABLE(olddev->info.romfile, newdev->info.romfile)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network rom file")); goto cleanup; } + + if (newdev->info.bootIndex == 0) + newdev->info.bootIndex = olddev->info.bootIndex; if (olddev->info.bootIndex != newdev->info.bootIndex) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device boot index setting")); goto cleanup; } + + if (newdev->info.romenabled == VIR_TRISTATE_BOOL_ABSENT) + newdev->info.romenabled = olddev->info.romenabled; if (olddev->info.romenabled != newdev->info.romenabled) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device rom enabled setting")); goto cleanup; } + + /* if pci addr is missing or is invalid we overwrite it from olddev */ + if (!virDomainDeviceAddressIsValid(&newdev->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) { + newdev->info.addr.pci = olddev->info.addr.pci; + } + if (!virPCIDeviceAddressEqual(&olddev->info.addr.pci, + &newdev->info.addr.pci)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot modify network device guest PCI address")); + goto cleanup; + } /* (end of device info checks) */ if (STRNEQ_NULLABLE(olddev->filter, newdev->filter) || -- 2.17.1

2 2

[libvirt] [PATCH v3 0/9] RISC-V Guest Support
by Lubomir Rintel 24 Aug '18

24 Aug '18

Hi. Third iteration of RISC-V guest support. I believe I addressed all points of Andrea's review. Tested with: images from [1]: virt-install \ --import --name riscv64 \ --arch riscv64 --machine virt \ --memory 2048 \ --rng /dev/urandom \ --disk /var/lib/libvirt/images/stage4-disk.img,bus=virtio \ --boot kernel=/var/lib/libvirt/images/bbl,kernel_args="console=ttyS0 ro root=/dev/vda" [1] https://fedorapeople.org/groups/risc-v/disk-images/ Note that the large test suite changes that touch the '*.replies' files seem to upset the mail server, thus you're unlikely to receive them from the list. You can get them straight from my repository instead: git pull https://github.com/lkundrak/libvirt.git lr/riscv-v3 Changes since v2: * Regenerated cap test data with QEMU 3.0.0 * Squashed the tests together * Folded "docs/schemas: add RISC-V architectures" into "util: add RISC-V architectures" * Streamlined the Virtio MMIO address assignment * Added qemuDomainIsRISCVVirt() and qemuDomainMachineIsRISCVVirt() * Cosmetic changes to "util: add RISC-V architectures" * New commits: qemu: add qemuDomainAssignVirtioMMIOAddresses() qemu: add qemuDomainIsRISCVVirt() and qemuDomainMachineIsRISCVVirt() qemu: RISC-V machines have no PCI news: Add a mention of RISC-V guest support * Dropped: qemu: no USB by default on RISC-V machines (not sure why I thought this was needed) Lubomir Rintel (9): qemu: rename qemuDomainMachineIsVirt() qemu: rename qemuDomainArmVirt() util: add RISC-V architectures qemu: RISC-V machines have no PCI qemu: add qemuDomainIsRISCVVirt() and qemuDomainMachineIsRISCVVirt() qemu: add qemuDomainAssignVirtioMMIOAddresses() qemu: assign addresses to virtio devices on RISC-V tests: Add RISC-V architectures news: Add a mention of RISC-V guest support docs/news.xml | 8 + docs/schemas/basictypes.rng | 2 + src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_domain.c | 46 +- src/qemu/qemu_domain.h | 9 +- src/qemu/qemu_domain_address.c | 34 +- src/util/virarch.c | 5 +- src/util/virarch.h | 8 +- tests/capabilityschemadata/caps-qemu-kvm.xml | 36 + .../caps_3.0.0.riscv32.replies | 14819 ++++++++++++++++ .../caps_3.0.0.riscv32.xml | 118 + .../caps_3.0.0.riscv64.replies | 14819 ++++++++++++++++ .../caps_3.0.0.riscv64.xml | 118 + tests/qemucapabilitiestest.c | 2 + tests/qemuxml2argvdata/riscv64-virt.args | 30 + tests/qemuxml2argvdata/riscv64-virt.xml | 32 + tests/qemuxml2argvtest.c | 3 + .../riscv64-virt.xml | 42 + tests/qemuxml2xmloutdata/riscv64-virt.xml | 36 + tests/qemuxml2xmltest.c | 2 + tests/testutilsqemu.c | 72 + tests/vircapstest.c | 6 + 23 files changed, 30232 insertions(+), 25 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml create mode 100644 tests/qemuxml2argvdata/riscv64-virt.args create mode 100644 tests/qemuxml2argvdata/riscv64-virt.xml create mode 100644 tests/qemuxml2startupxmloutdata/riscv64-virt.xml create mode 100644 tests/qemuxml2xmloutdata/riscv64-virt.xml -- 2.17.1

2 18

[libvirt] [PATCH] qemu: Make sure preferredMachines is not missing any entry
by Andrea Bolognani 24 Aug '18

24 Aug '18

With the current implementation, adding a new architecture and not updating preferredMachines accordingly will not cause a build failure, making it very likely that subtle bugs will be introduced in the process. Rework the code so that such issues will be caught by the compiler. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_capabilities.c | 84 ++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8a44d32c59..230beeab8c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2266,49 +2266,51 @@ virQEMUCapsProbeQMPDevices(virQEMUCapsPtr qemuCaps, * that we're not vulnerable to changes in QEMU defaults or machine * list ordering. */ -static const char *preferredMachines[VIR_ARCH_LAST] = +static const char *preferredMachines[] = { - [VIR_ARCH_ALPHA] = "clipper", - [VIR_ARCH_ARMV6L] = NULL, /* No QEMU impl */ - [VIR_ARCH_ARMV7L] = "integratorcp", - [VIR_ARCH_ARMV7B] = "integratorcp", - - [VIR_ARCH_AARCH64] = "integratorcp", - [VIR_ARCH_CRIS] = "axis-dev88", - [VIR_ARCH_I686] = "pc", - [VIR_ARCH_ITANIUM] = NULL, /* doesn't exist in QEMU any more */ - [VIR_ARCH_LM32] = "lm32-evr", - - [VIR_ARCH_M68K] = "mcf5208evb", - [VIR_ARCH_MICROBLAZE] = "petalogix-s3adsp1800", - [VIR_ARCH_MICROBLAZEEL] = "petalogix-s3adsp1800", - [VIR_ARCH_MIPS] = "malta", - [VIR_ARCH_MIPSEL] = "malta", - - [VIR_ARCH_MIPS64] = "malta", - [VIR_ARCH_MIPS64EL] = "malta", - [VIR_ARCH_OR32] = "or1k-sim", - [VIR_ARCH_PARISC] = NULL, /* No QEMU impl */ - [VIR_ARCH_PARISC64] = NULL, /* No QEMU impl */ - - [VIR_ARCH_PPC] = "g3beige", - [VIR_ARCH_PPCLE] = "g3beige", - [VIR_ARCH_PPC64] = "pseries", - [VIR_ARCH_PPC64LE] = "pseries", - [VIR_ARCH_PPCEMB] = "bamboo", - - [VIR_ARCH_S390] = NULL, /* No QEMU impl*/ - [VIR_ARCH_S390X] = "s390-ccw-virtio", - [VIR_ARCH_SH4] = "shix", - [VIR_ARCH_SH4EB] = "shix", - [VIR_ARCH_SPARC] = "SS-5", - - [VIR_ARCH_SPARC64] = "sun4u", - [VIR_ARCH_UNICORE32] = "puv3", - [VIR_ARCH_X86_64] = "pc", - [VIR_ARCH_XTENSA] = "sim", - [VIR_ARCH_XTENSAEB] = "sim", + NULL, /* VIR_ARCH_NONE (not a real arch :) */ + "clipper", /* VIR_ARCH_ALPHA */ + NULL, /* VIR_ARCH_ARMV6L (no QEMU impl) */ + "integratorcp", /* VIR_ARCH_ARMV7L */ + "integratorcp", /* VIR_ARCH_ARMV7B */ + + "integratorcp", /* VIR_ARCH_AARCH64 */ + "axis-dev88", /* VIR_ARCH_CRIS */ + "pc", /* VIR_ARCH_I686 */ + NULL, /* VIR_ARCH_ITANIUM (doesn't exist in QEMU any more) */ + "lm32-evr", /* VIR_ARCH_LM32 */ + + "mcf5208evb", /* VIR_ARCH_M68K */ + "petalogix-s3adsp1800", /* VIR_ARCH_MICROBLAZE */ + "petalogix-s3adsp1800", /* VIR_ARCH_MICROBLAZEEL */ + "malta", /* VIR_ARCH_MIPS */ + "malta", /* VIR_ARCH_MIPSEL */ + + "malta", /* VIR_ARCH_MIPS64 */ + "malta", /* VIR_ARCH_MIPS64EL */ + "or1k-sim", /* VIR_ARCH_OR32 */ + NULL, /* VIR_ARCH_PARISC (no QEMU impl) */ + NULL, /* VIR_ARCH_PARISC64 (no QEMU impl) */ + + "g3beige", /* VIR_ARCH_PPC */ + "g3beige", /* VIR_ARCH_PPCLE */ + "pseries", /* VIR_ARCH_PPC64 */ + "pseries", /* VIR_ARCH_PPC64LE */ + "bamboo", /* VIR_ARCH_PPCEMB */ + + NULL, /* VIR_ARCH_S390 (no QEMU impl) */ + "s390-ccw-virtio", /* VIR_ARCH_S390X */ + "shix", /* VIR_ARCH_SH4 */ + "shix", /* VIR_ARCH_SH4EB */ + "SS-5", /* VIR_ARCH_SPARC */ + + "sun4u", /* VIR_ARCH_SPARC64 */ + "puv3", /* VIR_ARCH_UNICORE32 */ + "pc", /* VIR_ARCH_X86_64 */ + "sim", /* VIR_ARCH_XTENSA */ + "sim", /* VIR_ARCH_XTENSAEB */ }; +verify(ARRAY_CARDINALITY(preferredMachines) == VIR_ARCH_LAST); static int -- 2.17.1

2 1

[libvirt] [PATCH v3 00/12] PCI passthrough support on s390
by Yi Min Zhao 24 Aug '18

24 Aug '18

Abstract ======== The PCI representation in QEMU has recently been extended for S390 allowing configuration of zPCI attributes like uid (user-defined identifier) and fid (PCI function identifier). The details can be found here: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg07262.html To support the new zPCI feature of the S390 platform, two new XML attributes, @uid and @fid, are introduced for device addresses of type 'pci', i.e.: <hostdev mode='subsystem' type='pci'> <driver name='vfio'/> <source> <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' uid='0x0003' fid='0x00000027'/> </hostdev> uid and fid are optional attributes. If they are defined by the user, unique values within the guest domain must be used. If they are not specified and the architecture requires them, they are automatically generated with non-conflicting values. Current implementation is the most seamless one for the user as it unites the address specific data of a PCI device on one XML element. It could accommodate both specifying our special parameters (uid and fid) and re-using standard statements (domain, bus, slot and function) for PCI devices. User can still specify bus/slot/function for the virtualized PCI devices in the XML. Thus uid/fid act as an extension to the PCI address and are stored in a new structure 'virZPCIDeviceAddress' which is a member of common PCI Address structure. Additionally, two hashtables are used for assignment and reservation of uid/fid. In support of extending the PCI address, a new PCI address extension flag is introduced. This extension flag allows is not only dedicated for the S390 platform but also other architectures needing certain extensions to PCI address space. Code Base ========= commit in master: 087de2f5a3: docs: formatdomain: fix spacing before parentheses Change Log ========== v2->v3: 1. Revise code style. 2. Update test cases. 3. Introduce qemuDomainCollectPCIAddressExtension() to collect PCI extension addresses. 4. Introduce virDeviceInfoPCIAddressExtensionPresent() to check if zPCI address exists. 5. Optimize zPCI address check logic. 6. Optimize passed parameters of zPCI addr alloc/release/reserve functions. 7. Report enum range error in qemuDomainDeviceSupportZPCI(). 8. Update commit messages. v1->v2: 1. Separate test commit and merge testcases into corresponding commits that introduce the functionalities firstly. 2. Spare some checks for zpci device. 3. Add vsock and controller support. 4. Add uin32 type schema. 5. Rename zpciuid and zpcifid to zpci_uid and zpci_fid. 6. Always return multibus support on S390. Yi Min Zhao (12): conf: Add definitions for 'uid' and 'fid' PCI address attributes qemu: Introduce zPCI capability conf: Introduce a new PCI address extension flag qemu: Enable PCI multi bus for S390 guests qemu: Auto add pci-root for s390/s390x guests conf: Introduce address caching for PCI extensions conf: Introduce parser, formatter for uid and fid conf: Allocate/release 'uid' and 'fid' in PCI address qemu: Generate and use zPCI device in QEMU command line qemu: Add hotpluging support for PCI devices on S390 guests docs: Add 'uid' and 'fid' information news: Update news for PCI address extension attributes docs/formatdomain.html.in | 9 +- docs/news.xml | 11 + docs/schemas/basictypes.rng | 23 ++ docs/schemas/domaincommon.rng | 1 + src/conf/device_conf.c | 78 +++++ src/conf/device_conf.h | 8 + src/conf/domain_addr.c | 379 +++++++++++++++++++++ src/conf/domain_addr.h | 29 ++ src/conf/domain_conf.c | 6 + src/libvirt_private.syms | 4 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 114 +++++++ src/qemu/qemu_command.h | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain_address.c | 204 ++++++++++- src/qemu/qemu_hotplug.c | 155 ++++++++- src/util/virpci.h | 13 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemuxml2argvdata/disk-virtio-s390-zpci.args | 27 ++ tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml | 17 + .../hostdev-vfio-zpci-autogenerate.args | 26 ++ .../hostdev-vfio-zpci-autogenerate.xml | 18 + .../hostdev-vfio-zpci-boundaries.args | 30 ++ .../hostdev-vfio-zpci-boundaries.xml | 26 ++ .../hostdev-vfio-zpci-multidomain-many.args | 40 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 67 ++++ tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 26 ++ tests/qemuxml2argvdata/hostdev-vfio-zpci.xml | 19 ++ tests/qemuxml2argvtest.c | 17 + tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml | 29 ++ .../hostdev-vfio-zpci-autogenerate.xml | 30 ++ .../hostdev-vfio-zpci-boundaries.xml | 42 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 79 +++++ tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml | 30 ++ tests/qemuxml2xmltest.c | 14 + 41 files changed, 1575 insertions(+), 14 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml -- Yi Min

5 78

[libvirt] [PATCH] storage: fix the error message when encrypted raw volume resize
by Shivaprasad G Bhat 23 Aug '18

23 Aug '18

The vol-dumpxml shows the volume target format type as raw for encrypted volumes. The error message when attempting to resize with prealloc is confusing here. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/storage/storage_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 42a9b6abf0..2abedb24b0 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2343,7 +2343,7 @@ virStorageBackendVolResizeLocal(virStoragePoolObjPtr pool, } else if (vol->target.format == VIR_STORAGE_FILE_RAW && vol->target.encryption) { if (pre_allocate) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("preallocate is only supported for raw " + _("preallocate is only supported for unencrypted raw " "type volume")); return -1; }

2 1

[libvirt] [PATCH v4 0/3] vsh: Introduce new API for printing tables
by Simon Kobyda 23 Aug '18

23 Aug '18

Created new API for priting tables, mainly to solve alignment problems. Implemented these test to virsh list. In the future, API may be everywhere in virsh and virt-admin. Also wrote basic tests for the new API, and corrected tests in virshtest which are influenced by implementation of the API in virsh list. Changes in v4: - fixed width calculation for zero-width, nonprintable and combined character. (pulled some code from linux-util) - added tests for cases mentioned above - changed usage of vshControl variables. From now on PrintToStdout calls PrintToString and then prints returned string to stdout Changes in v3: - changed encoding of 3/3 patch, otherwise it cannot be applied Changes in v2: - added tests - fixed alignment for unicode character which span more spaces - moved ncolumns check to vshTableRowAppend - changed arguments for functions vshTablePrint, vshTablePrintToStdout, vshTablePrintToString Simon Kobyda (3): vsh: Add API for printing tables. virsh: Implement new table API for virsh list vsh: Added tests tests/Makefile.am | 8 + tests/virshtest.c | 14 +- tests/vshtabletest.c | 393 ++++++++++++++++++++++++++++ tools/Makefile.am | 4 +- tools/virsh-domain-monitor.c | 43 ++-- tools/vsh-table.c | 483 +++++++++++++++++++++++++++++++++++ tools/vsh-table.h | 42 +++ 7 files changed, 960 insertions(+), 27 deletions(-) create mode 100644 tests/vshtabletest.c create mode 100644 tools/vsh-table.c create mode 100644 tools/vsh-table.h -- 2.17.1

3 9

[libvirt] [PATCH 0/5] docs: api_extension: Clean up and modernize
by Peter Krempa 23 Aug '18

23 Aug '18

Drop the old patches which don't make a good example any more and freshen up some facts. Peter Krempa (5): docs: api_extension: Remove links to the stale example patches docs: api_extension: Remove example patches docs: api_extension: Don't encourage other tools than git docs: api_extension: Remove note to extend libvirt-TCK docs: api_extension: Freshen up paths docs/Makefile.am | 4 +- docs/api_extension.html.in | 111 +--- docs/api_extension/0001-add-to-xml.patch | 145 ---- docs/api_extension/0002-add-new-public-API.patch | 62 -- .../0003-define-internal-driver-API.patch | 222 ------- .../0004-implement-the-public-APIs.patch | 188 ------ .../0005-implement-the-remote-protocol.patch | 421 ------------ ...06-make-old-API-trivially-wrap-to-new-API.patch | 735 --------------------- docs/api_extension/0007-add-virsh-support.patch | 388 ----------- docs/api_extension/0008-support-new-xml.patch | 519 --------------- .../0009-support-all-flags-in-test-driver.patch | 197 ------ ...improve-vcpu-support-in-qemu-command-line.patch | 122 ---- ...0011-complete-vcpu-support-in-qemu-driver.patch | 169 ----- ...-improve-vcpu-support-in-xen-command-line.patch | 294 --------- .../0013-improve-getting-xen-vcpu-counts.patch | 216 ------ .../0014-improve-setting-xen-vcpu-counts.patch | 342 ---------- docs/api_extension/0015-remove-dead-xen-code.patch | 228 ------- 17 files changed, 25 insertions(+), 4338 deletions(-) delete mode 100644 docs/api_extension/0001-add-to-xml.patch delete mode 100644 docs/api_extension/0002-add-new-public-API.patch delete mode 100644 docs/api_extension/0003-define-internal-driver-API.patch delete mode 100644 docs/api_extension/0004-implement-the-public-APIs.patch delete mode 100644 docs/api_extension/0005-implement-the-remote-protocol.patch delete mode 100644 docs/api_extension/0006-make-old-API-trivially-wrap-to-new-API.patch delete mode 100644 docs/api_extension/0007-add-virsh-support.patch delete mode 100644 docs/api_extension/0008-support-new-xml.patch delete mode 100644 docs/api_extension/0009-support-all-flags-in-test-driver.patch delete mode 100644 docs/api_extension/0010-improve-vcpu-support-in-qemu-command-line.patch delete mode 100644 docs/api_extension/0011-complete-vcpu-support-in-qemu-driver.patch delete mode 100644 docs/api_extension/0012-improve-vcpu-support-in-xen-command-line.patch delete mode 100644 docs/api_extension/0013-improve-getting-xen-vcpu-counts.patch delete mode 100644 docs/api_extension/0014-improve-setting-xen-vcpu-counts.patch delete mode 100644 docs/api_extension/0015-remove-dead-xen-code.patch -- 2.16.2

4 18

[libvirt] [PATCH v2 0/3] ui: remove deprecated UI frontends
by Daniel P. Berrangé 23 Aug '18

23 Aug '18

We deprecated GTK2 and SDL1.2 in the 2.12.0 release, so they are able to be removed entirely in the 3.1.0 release. The min GTK3 version can also be bumped up based the distros we aim to support. Note that before this can merge, the openbsd VM test image needs to be updated to have SDL2, as openbsd build mandates SDL availability. The freebsd & netbsd images should also be updated, but they are not build blockers as they automatically disable SDL Changed in v2: - Rebased to resolve conflicts Daniel P. Berrangé (3): ui: remove support for GTK2 in favour of GTK3 ui: increase min required GTK3 version to 3.14.0 ui: remove support for SDL1.2 in favour of SDL2 configure | 111 +---- include/ui/gtk.h | 9 - qemu-deprecated.texi | 16 - ui/Makefile.objs | 5 - ui/gtk-egl.c | 10 +- ui/gtk.c | 202 +------- ui/sdl.c | 1027 ---------------------------------------- ui/sdl_zoom.c | 93 ---- ui/sdl_zoom.h | 25 - ui/sdl_zoom_template.h | 219 --------- 10 files changed, 33 insertions(+), 1684 deletions(-) delete mode 100644 ui/sdl.c delete mode 100644 ui/sdl_zoom.c delete mode 100644 ui/sdl_zoom.h delete mode 100644 ui/sdl_zoom_template.h -- 2.17.1

3 5

[libvirt] [PULL 00/12] Ui 20180821 v2 patches
by Gerd Hoffmann 23 Aug '18

23 Aug '18

The following changes since commit d0092d90eb546a8bbe9e9120426c189474123797: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180820' into staging (2018-08-20 17:41:18 +0100) are available in the git repository at: git://git.kraxel.org/qemu tags/ui-20180821-v2-pull-request for you to fetch changes up to 37bdff33227c3248ab9af784246da5b6c08111ea: util: promote qemu_egl_rendernode_open() to libqemuutil (2018-08-21 14:01:48 +0200) ---------------------------------------------------------------- ui: misc ui fixed which piled up during 3.0 release freeze. ---------------------------------------------------------------- Daniel P. Berrangé (2): doc: switch to modern syntax for VNC TLS setup vnc: remove support for deprecated tls, x509, x509verify options Marc-André Lureau (3): ui: use enum to string helpers dmabuf: add y0_top, pass it to spice util: promote qemu_egl_rendernode_open() to libqemuutil Paolo Bonzini (2): spice-display: access ptr_x/ptr_y under Mutex spice-display: fix qemu_spice_cursor_refresh_bh locking Peter Wu (1): vnc: fix memleak of the "vnc-worker-output" name Philippe Mathieu-Daudé (1): ui/vnc: Remove useless parenthesis around DIV_ROUND_UP macro Tao Wu via Qemu-devel (1): sdl2: redraw correctly when scanout_mode enabled. Thomas Huth (2): ui/sdl2: Remove the obsolete SDL_INIT_NOPARACHUTE flag ui/sdl2: Fix broken -full-screen CLI option include/qemu/drm.h | 6 ++++ include/ui/console.h | 1 + qemu-keymap.c | 2 +- ui/console.c | 6 ++-- ui/egl-helpers.c | 51 ++-------------------------- ui/sdl2-gl.c | 5 +++ ui/sdl2.c | 13 +++----- ui/spice-display.c | 42 +++++++++++++++-------- ui/vnc-enc-tight.c | 2 +- ui/vnc-jobs.c | 3 +- ui/vnc.c | 94 ++-------------------------------------------------- util/drm.c | 66 ++++++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + qemu-deprecated.texi | 20 ----------- qemu-doc.texi | 20 ++++++++--- qemu-options.hx | 43 ------------------------ util/Makefile.objs | 1 + 17 files changed, 139 insertions(+), 237 deletions(-) create mode 100644 include/qemu/drm.h create mode 100644 util/drm.c -- 2.9.3

2 14

[libvirt] libvirt and virt-manager - Unable to complete install: 'internal error: unsupported input bus usb'
by Eduardo Lúcio Amorim Costa 23 Aug '18

23 Aug '18

I'm trying create a virtual machine using Xen as hypervisor and virt-manager (libvirt) as the management module. When trying to create the virtual machine I am getting the following error: " Unable to complete install: 'internal error: unsupported input bus usb' " ERROR DETAILS: Unable to complete install: 'internal error: unsupported input bus usb' Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/asyncjob.py", line 75, in cb_wrapper callback(asyncjob, *args, **kwargs) File "/usr/share/virt-manager/virtManager/create.py", line 2276, in _do_async_install guest.start_install(meter=meter) File "/usr/share/virt-manager/virtinst/guest.py", line 461, in start_install doboot, transient) File "/usr/share/virt-manager/virtinst/guest.py", line 397, in _create_guest domain = self.conn.createXML(install_xml or final_xml, 0) File "/usr/lib/python3.7/site-packages/libvirt.py", line 3717, in createXML if ret is None:raise libvirtError('virDomainCreateXML() failed', conn=self) libvirt.libvirtError: internal error: unsupported input bus usb NOTE I: The deploy process follows the instructions here https://www.youtube.com/watch?v=BwkmDM-Gpzc and here https://wiki.centos.org/HowTos/Xen/Xen4QuickStart . NOTE II: Xen Hypervisor uses a CentOS 7 as "domu". MORE INFORMATION ABOUT THE PROBLEM HERE: https://unix.stackexchange.com/q/464186/61742 Thanks! =D

2 1

[libvirt] proposal: file renames for consistency
by Eric Blake 23 Aug '18

23 Aug '18

We have an inconsistent mix of multi-word file names that use dash vs. underscore to separate those words. $ git ls-files '**/*_*' | wc 2497 2497 146485 $ git ls-files '**/*-*' | wc 8147 8147 444426 Some of those are overlaps (meaning we can't make up our minds), such as: docs/api_extension/0001-add-to-xml.patch However, my personal preference is to use dash everywhere (or at least on all the .[ch] files), for at least several reasons: 1. dash is easier to type (at least on US keyboards), as it does not require the shift key [I find it easier to edit files in tools/ than in src/qemu/ for example, because I don't have to worry about shift] 2. include/ uses only dash, not underscore; if our public interface favors that spelling, our internal files should too 3. underscore is easier to miss visually when other markup like underline is being applied (for example, when viewing the git repository online and hovering over a filename). Granted, you can still often tell that an underscore is present vs. a space (or in general, realize that we avoid spaces in file names in our git tree, so it must be an underscore); but I still find dash much easier to pick out. Since git rename detection does a good job at tracking history by content over file renames, a mass rename wouldn't even be that invasive to git archaeology or patch backporting. If you're worried about finger memory typing the wrong form, but you use bash, it's possible to configure bash to treat '-' and '_' interchangeably during TAB-completion (similar to case insensitive tab completion), which reduces some of the pain, but it doesn't solve everything. So, would anyone like a beginner's project of consistently renaming files, and/or would anyone object if I submitted some patches along those lines? -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org

3 2

[libvirt] [PATCH] util: eventpoll: Survive EBADF on macOS
by Roman Bolshakov 23 Aug '18

23 Aug '18

Fixes: https://www.redhat.com/archives/libvir-list/2017-January/msg00978.html QEMU is probed through monitor fd to check capabilities during libvirtd init. The monitor fd is closed after probing by virQEMUCapsInitQMPCommandFree that calls virQEMUCapsInitQMPCommandAbort that calls qemuMonitorClose, the latter one notifies the event loop via an interrupt handle in qemuMonitorUnregister and after then closes monitor fd. There could be a case when interrupt is sent after eventLoop is unlocked but before virEventPollRunOnce blocks in poll, shortly before file descriptor is closed by qemuMonitorClose. Then poll receives closed monitor fd in fdset and returns EBADF. EBADF is not mentioned as a valid errno on macOS poll man-page but such behaviour can appear release-to-release, according to cpython: https://github.com/python/cpython/blob/master/Modules/selectmodule.c#L1161 The change also fixes the issue in qemucapabilitiestest. It returns Bad file descriptor message 25 times without the fix. Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- src/util/vireventpoll.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index 13d278df13..6d19374c52 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -643,10 +643,18 @@ int virEventPollRunOnce(void) EVENT_DEBUG("Poll got error event %d", errno); if (errno == EINTR || errno == EAGAIN) goto retry; +#ifdef __APPLE__ + if (errno == EBADF) { + ret = 0; + goto dispatch; + } +#endif virReportSystemError(errno, "%s", _("Unable to poll on file handles")); return -1; } + + dispatch: EVENT_DEBUG("Poll got %d event(s)", ret); virMutexLock(&eventLoop.lock); -- 2.15.2 (Apple Git-101.1)

2 3

[libvirt] Matching the type of mediated devices in the migration
by Wang, Zhi A 23 Aug '18

23 Aug '18

BACKGROUND As the live migration of mdev is going to be supported in VFIO, a scheme of deciding if a mdev could be migratable between the source machine and the destination machine is needed. Mostly, this email is going to discuss a possible solution which needs fewer modifications of libvirt/VFIO. The configuration of a mdev is located in the domain XML, which guides libvirt how to find the mdev and generating the command line for QEMU. It basically only includes the UUID of a mdev. The domain XML of the source machine and destination machine are going to be compared before the migration really happens. Each configuration item would be compared and checked by libvirt. If one item of the source machine is different from the item of destination machine, the migration fails. For mdev, there is no any check/match before the migration happens yet. The user could use the node device list of libvirt to list the host devices and see the capabilities of those devices. The current node device code of libvirt has already been able to extract the supported mdev types from a host PCI device, plus some basic information, like max supported mdev instance of a host PCI device. THE SOLUTION To strictly check the mdev type and make sure the migration happens between the compatible mediated devices, three new mandatory elements in the domain XML below the hostdev element would be introduced: vendorid: The vendor ID of the mdev, which comes from the host PCI device. A user could obtain this information from the host PCI device which supports mdev in the node device list. productid: The product ID of the mdev, which also comes from the host PCI device. A user could obtain this information from the same approach above. mdevtype: The type of the mdev. As the creation of the mdev is managed by the user, the user knows the type of the mdev and would be responsible for filling out this information. These three elements are only needed when the device API of a mdev is "vfio-PCI". Take the example of mdev configuration from https://libvirt.org/formatdomain.html to illustrate the modification: <devices> <hostdev mode='subsystem' type='mdev' model='vfio-pci'> <source> <address uuid='c2177883-f1bb-47f0-914d-32a22e3a8804'/> <vendorid>0xdead</vendorid>  <productid>0xbeef</productid>  <mdevtype>type</mdevtype>  </source> </hostdev> With the newly introduced elements above, the flow of the creation of a domain XML with mdev will be like: 1. The user obtains the vendorid/productid from node device list 2. The user fills the vendorid/productid/mdevtype in the domain XML 3. When a migration happens, libvirt check these elements. If one item is different between two domain XML, then migration fails. POSSIBLE MODIFICATION OF LIBVIRT 1) Introduce three new elements in domain XML parsing and processing functions. 2) Extend the function virDomainDeviceInfoCheckABIStability() which is going to check the host dev part of the domain XMLs between the source machine and the destination machine. So it could fail the migration when it finds out the IDs and the mdev type are different between domain XMLs. PROS Minor changes in libvirt could achieve the mdev type match in the migration. Modifying VFIO and other mdev components is not necessary. Thanks, Zhi.

6 21

[libvirt] [PATCH] Take DryRun code out of virCommand* code flow
by Shi Lei 23 Aug '18

23 Aug '18

Since dry-run of cmd is just for tests now, it would be better to remove dry-run code and move them to testutils. Then the code flow in virCommand* could be more general. There are 3 steps in this patch: 1. Introduce a new global hook (of virExecHook type) which will be called in code flow just before the cmd->hook. The global hook is also called in child process. If it returns 1, the child process will exit with status in advance and the parent will process io and wait for the child normally. It prepares for registering dry-run and anything else. The virCommandSetPreExecHook is modified for registering both types of hooks. 2. Implement virTestSetDryRun with dry-run code in "testutils.c". It substitutes for virCommandSetDryRun. The virTestSetDryRun invokes virCommandSetPreExecHook to register a function on the global hook which will fill in cmdline buffer and call callback for tests. 3. Remove all dryrun code in "vircommand.c" and remove virCommandSetDryRun API. Diffs from old dry-run: The new global hook is called in child process. So dryrun-callback for tests should write to stdout/stderr when they need output something. Now the opaque argument for dryrun-callback cannot be inout. In "tests/viriscsitest.c", iface_created in opaque of callback is an inout argument. There's a bit complicated to transfer it between the child and its parent. So this patch use a temporary file to do that. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com> --- docs/internals/command.html.in | 33 +++++- src/libvirt_private.syms | 4 +- src/qemu/qemu_process.c | 8 +- src/util/vircommand.c | 151 ++++++++++++---------------- src/util/vircommand.h | 18 +++- src/util/vircommandpriv.h | 19 ++-- tests/networkxml2firewalltest.c | 7 +- tests/nwfilterebiptablestest.c | 32 +++--- tests/nwfilterxml2firewalltest.c | 6 +- tests/testutils.c | 210 +++++++++++++++++++++++++++++++++++++++ tests/testutils.h | 2 + tests/virfirewalltest.c | 71 ++++++------- tests/viriscsitest.c | 120 ++++++++++++++++------ tests/virkmodtest.c | 10 +- tests/virnetdevbandwidthtest.c | 6 +- 15 files changed, 482 insertions(+), 215 deletions(-) diff --git a/docs/internals/command.html.in b/docs/internals/command.html.in index 43f51a4..44478f0 100644 --- a/docs/internals/command.html.in +++ b/docs/internals/command.html.in @@ -398,17 +398,40 @@ virCommandSetWorkingDirectory(cmd, LOCALSTATEDIR); <h3><a id="hooks">Any additional hooks</a></h3> <p> - If anything else is needed, it is possible to request a hook - function that is called in the child after the fork, as the + If anything else is needed, it is possible to request hook + functions that are called in the child after the fork, as the last thing before changing directories, dropping capabilities, - and executing the new process. If hook(opaque) returns - non-zero, then the child process will not be run. + and executing the new process. + + There are two types of hooks: + <ul> + <li>Global hook takes effect to all command. + Setting global hook if passing NULL to @cmd. + </li> + <li>Command hook takes effect only to the command. + Passing the pointer of the command to @cmd. + </li> + </ul> + + If hook(opaque) returns -1, then the child process will not be + run for error. And if it returns 1, the child process will exit + with status in advance and this mode is used for command dryrun. + + Since @hook runs in the child, it should be careful to avoid + any functions that are not async-signal-safe. + + For global hook, Passing NULL for @cmd, @hook and @opaque to + cancel the effect. </p> <pre> -virCommandSetPreExecHook(cmd, hook, opaque); +virCommandSetPreExecHook(NULL, hook, opaque); /* global hook */ +virCommandSetPreExecHook(cmd, hook, opaque); /* command hook */ + +virCommandSetPreExecHook(NULL, NULL, NULL); /* cancel global hook */ </pre> + <h3><a id="logging">Logging commands</a></h3> <p> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 47ea35f..f4aca6f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1602,7 +1602,10 @@ virCommandDaemonize; virCommandDoAsyncIO; virCommandExec; virCommandFree; +virCommandGetArgs; +virCommandGetEnv; virCommandGetGID; +virCommandGetInputBuffer; virCommandGetUID; virCommandHandshakeNotify; virCommandHandshakeWait; @@ -1621,7 +1624,6 @@ virCommandRunAsync; virCommandRunNul; virCommandRunRegex; virCommandSetAppArmorProfile; -virCommandSetDryRun; virCommandSetErrorBuffer; virCommandSetErrorFD; virCommandSetGID; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ab74938..f7a5dbd 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2656,7 +2656,9 @@ qemuProcessKillManagedPRDaemon(virDomainObjPtr vm) static int -qemuProcessStartPRDaemonHook(void *opaque) +qemuProcessStartPRDaemonHook(void *opaque, + virCommandPtr ptr ATTRIBUTE_UNUSED, + int *status ATTRIBUTE_UNUSED) { virDomainObjPtr vm = opaque; size_t i, nfds = 0; @@ -2972,7 +2974,9 @@ struct qemuProcessHookData { virQEMUDriverConfigPtr cfg; }; -static int qemuProcessHook(void *data) +static int qemuProcessHook(void *data, + virCommandPtr ptr ATTRIBUTE_UNUSED, + int *status ATTRIBUTE_UNUSED) { struct qemuProcessHookData *h = data; qemuDomainObjPrivatePtr priv = h->vm->privateData; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 8be3fdf..53aee7a 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -138,11 +138,9 @@ struct _virCommand { int mask; }; -/* See virCommandSetDryRun for description for this variable */ -static virBufferPtr dryRunBuffer; -static virCommandDryRunCallback dryRunCallback; -static void *dryRunOpaque; -static int dryRunStatus; +/* See virCommandSetPreExecHook for these variable */ +static virExecHook preExecHook; +static void *preExecOpaque; /* * virCommandFDIsSet: @@ -717,12 +715,32 @@ virExec(virCommandPtr cmd) virProcessSetMaxCoreSize(0, cmd->maxCore) < 0) goto fork_error; + if (preExecHook) { + int status = 0; + ret = preExecHook(preExecOpaque, cmd, &status); + if (ret < 0) + goto fork_error; + + if (ret == 1) { + /* Child skips followed steps and exits with status in advance. */ + ret = status; + goto fork_error; + } + } + if (cmd->hook) { + int status = 0; VIR_DEBUG("Run hook %p %p", cmd->hook, cmd->opaque); - ret = cmd->hook(cmd->opaque); + ret = cmd->hook(cmd->opaque, cmd, &status); VIR_DEBUG("Done hook %d", ret); if (ret < 0) goto fork_error; + + if (ret == 1) { + /* Child skips followed steps and exits with status in advance. */ + ret = status; + goto fork_error; + } } # if defined(WITH_SECDRIVER_SELINUX) @@ -1733,6 +1751,13 @@ virCommandSetInputBuffer(virCommandPtr cmd, const char *inbuf) } +const char * +virCommandGetInputBuffer(virCommandPtr cmd) +{ + return (const char *) cmd->inbuf; +} + + /** * virCommandSetOutputBuffer: * @cmd: the command to modify @@ -1879,7 +1904,9 @@ virCommandSetErrorFD(virCommandPtr cmd, int *errfd) /** * virCommandSetPreExecHook: - * @cmd: the command to modify + * @cmd: the command pointer or NULL. + * NonNull, means that it registers a hook for the command + * Null, means that it registers the global PreExecHook * @hook: the hook to run * @opaque: argument to pass to the hook * @@ -1887,13 +1914,30 @@ virCommandSetErrorFD(virCommandPtr cmd, int *errfd) * directories, dropping capabilities, and executing the new process. * Force the child to fail if HOOK does not return zero. * + * There are two types of hooks: + * 1. Global hook take effect to all command. + * Setting global hook if passing NULL to @cmd. + * 2. Command hook take effect only to the command. + * Passing the pointer of the command to @cmd. + * * Since @hook runs in the child, it should be careful to avoid * any functions that are not async-signal-safe. + + * For global hook, Passing NULL for @cmd, @hook and @opaque to cancel + * the effect. */ void virCommandSetPreExecHook(virCommandPtr cmd, virExecHook hook, void *opaque) { - if (!cmd || cmd->has_error) + if (!cmd) { + /* Global hook */ + preExecHook = hook; + preExecOpaque = opaque; + return; + } + + /* Command hook */ + if (cmd->has_error) return; if (cmd->hook) { @@ -2017,11 +2061,6 @@ virCommandProcessIO(virCommandPtr cmd) size_t inoff = 0; int ret = 0; - if (dryRunBuffer || dryRunCallback) { - VIR_DEBUG("Dry run requested, skipping I/O processing"); - return 0; - } - /* With an input buffer, feed data to child * via pipe */ if (cmd->inbuf) @@ -2439,31 +2478,6 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid) goto cleanup; } - str = virCommandToString(cmd); - if (dryRunBuffer || dryRunCallback) { - dryRunStatus = 0; - if (!str) { - /* error already reported by virCommandToString */ - goto cleanup; - } - - if (dryRunBuffer) { - VIR_DEBUG("Dry run requested, appending stringified " - "command to dryRunBuffer=%p", dryRunBuffer); - virBufferAdd(dryRunBuffer, str, -1); - virBufferAddChar(dryRunBuffer, '\n'); - } - if (dryRunCallback) { - dryRunCallback((const char *const*)cmd->args, - (const char *const*)cmd->env, - cmd->inbuf, cmd->outbuf, cmd->errbuf, - &dryRunStatus, dryRunOpaque); - } - ret = 0; - goto cleanup; - } - - VIR_DEBUG("About to run %s", str ? str : cmd->args[0]); ret = virExec(cmd); VIR_DEBUG("Command result %d, with PID %d", ret, (int)cmd->pid); @@ -2537,16 +2551,6 @@ virCommandWait(virCommandPtr cmd, int *exitstatus) return -1; } - if (dryRunBuffer || dryRunCallback) { - VIR_DEBUG("Dry run requested, returning status %d", - dryRunStatus); - if (exitstatus) - *exitstatus = dryRunStatus; - else if (dryRunStatus) - return -1; - return 0; - } - if (cmd->pid == -1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("command is not yet running")); @@ -2878,48 +2882,21 @@ virCommandDoAsyncIO(virCommandPtr cmd) cmd->flags |= VIR_EXEC_ASYNC_IO | VIR_EXEC_NONBLOCK; } -/** - * virCommandSetDryRun: - * @buf: buffer to store stringified commands - * @callback: callback to process input/output/args - * - * Sometimes it's desired to not actually run given command, but - * see its string representation without having to change the - * callee. Unit testing serves as a great example. In such cases, - * the callee constructs the command and calls it via - * virCommandRun* API. The virCommandSetDryRun allows you to - * modify this behavior: once called, every call to - * virCommandRun* results in command string representation being - * appended to @buf instead of being executed. If @callback is - * provided, then it is invoked with the argv, env and stdin - * data string for the command. It is expected to fill the stdout - * and stderr data strings and exit status variables. - * - * The strings stored in @buf are escaped for a shell and - * separated by a newline. For example: - * - * virBuffer buffer = VIR_BUFFER_INITIALIZER; - * virCommandSetDryRun(&buffer); - * - * virCommandPtr echocmd = virCommandNewArgList("/bin/echo", "Hello world", NULL); - * virCommandRun(echocmd, NULL); - * - * After this, the @buffer should contain: - * - * /bin/echo 'Hello world'\n - * - * To cancel this effect pass NULL for @buf and @callback. - */ -void -virCommandSetDryRun(virBufferPtr buf, - virCommandDryRunCallback cb, - void *opaque) + +const char *const* +virCommandGetArgs(virCommandPtr cmd) +{ + return (const char *const*) cmd->args; +} + + +const char *const* +virCommandGetEnv(virCommandPtr cmd) { - dryRunBuffer = buf; - dryRunCallback = cb; - dryRunOpaque = opaque; + return (const char *const*) cmd->env; } + #ifndef WIN32 /** * virCommandRunRegex: diff --git a/src/util/vircommand.h b/src/util/vircommand.h index 90bcc6c..9f322d8 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -29,10 +29,22 @@ typedef struct _virCommand virCommand; typedef virCommand *virCommandPtr; -/* This will execute in the context of the first child +/* + * virExecHook: + * @data: opaque for this hook + * @cmd: pointer to virCommand + * @status: get status for exit status of the child, + * valid only if return code is 1. + * + * This will execute in the context of the first child * after fork() but before execve(). As such, it is unsafe to - * call any function that is not async-signal-safe. */ -typedef int (*virExecHook)(void *data); + * call any function that is not async-signal-safe. + * + * Returns: 0 on success, + * -1 on usage error (errno is ENOMEM on OOM), + * 1 to notify child exit with status from child in advance + */ +typedef int (*virExecHook)(void *data, virCommandPtr cmd, int *status); pid_t virFork(void) ATTRIBUTE_RETURN_CHECK; diff --git a/src/util/vircommandpriv.h b/src/util/vircommandpriv.h index 8930299..f2b6063 100644 --- a/src/util/vircommandpriv.h +++ b/src/util/vircommandpriv.h @@ -20,7 +20,7 @@ */ #ifndef __VIR_COMMAND_PRIV_H_ALLOW__ -# error "vircommandpriv.h may only be included by vircommand.c or test suites" +# error "vircommandpriv.h may only be included by vircommand.c or testutils.c" #endif #ifndef __VIR_COMMAND_PRIV_H__ @@ -28,16 +28,13 @@ # include "vircommand.h" -typedef void (*virCommandDryRunCallback)(const char *const*args, - const char *const*env, - const char *input, - char **output, - char **error, - int *status, - void *opaque); +const char *const* +virCommandGetArgs(virCommandPtr cmd); -void virCommandSetDryRun(virBufferPtr buf, - virCommandDryRunCallback cb, - void *opaque); +const char *const* +virCommandGetEnv(virCommandPtr cmd); + +const char * +virCommandGetInputBuffer(virCommandPtr cmd); #endif /* __VIR_COMMAND_PRIV_H__ */ diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index 242b645..196c0b1 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -31,9 +31,6 @@ # define __VIR_FIREWALL_PRIV_H_ALLOW__ # include "virfirewallpriv.h" -# define __VIR_COMMAND_PRIV_H_ALLOW__ -# include "vircommandpriv.h" - # define VIR_FROM_THIS VIR_FROM_NONE static const char *abs_top_srcdir; @@ -53,7 +50,7 @@ static int testCompareXMLToArgvFiles(const char *xml, virNetworkDefPtr def = NULL; int ret = -1; - virCommandSetDryRun(&buf, NULL, NULL); + virTestSetDryRun(&buf, NULL, NULL); if (!(def = virNetworkDefParseFile(xml))) goto cleanup; @@ -66,7 +63,6 @@ static int testCompareXMLToArgvFiles(const char *xml, actualargv = virBufferContentAndReset(&buf); virTestClearCommandPath(actualargv); - virCommandSetDryRun(NULL, NULL, NULL); if (virTestCompareToFile(actualargv, cmdline) < 0) goto cleanup; @@ -74,6 +70,7 @@ static int testCompareXMLToArgvFiles(const char *xml, ret = 0; cleanup: + virTestSetDryRun(NULL, NULL, NULL); virBufferFreeAndReset(&buf); VIR_FREE(expectargv); VIR_FREE(actualargv); diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index 6073423..186349c 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -29,12 +29,8 @@ #define __VIR_FIREWALL_PRIV_H_ALLOW__ #include "virfirewallpriv.h" -#define __VIR_COMMAND_PRIV_H_ALLOW__ -#include "vircommandpriv.h" - #define VIR_FROM_THIS VIR_FROM_NONE - #define VIR_NWFILTER_NEW_RULES_TEARDOWN \ "iptables -D libvirt-out -m physdev --physdev-is-bridged --physdev-out vnet0 -g FP-vnet0\n" \ "iptables -D libvirt-out -m physdev --physdev-out vnet0 -g FP-vnet0\n" \ @@ -104,7 +100,7 @@ testNWFilterEBIPTablesAllTeardown(const void *opaque ATTRIBUTE_UNUSED) char *actual = NULL; int ret = -1; - virCommandSetDryRun(&buf, NULL, NULL); + virTestSetDryRun(&buf, NULL, NULL); if (ebiptables_driver.allTeardown("vnet0") < 0) goto cleanup; @@ -122,7 +118,7 @@ testNWFilterEBIPTablesAllTeardown(const void *opaque ATTRIBUTE_UNUSED) ret = 0; cleanup: - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; @@ -175,7 +171,7 @@ testNWFilterEBIPTablesTearOldRules(const void *opaque ATTRIBUTE_UNUSED) char *actual = NULL; int ret = -1; - virCommandSetDryRun(&buf, NULL, NULL); + virTestSetDryRun(&buf, NULL, NULL); if (ebiptables_driver.tearOldRules("vnet0") < 0) goto cleanup; @@ -193,7 +189,7 @@ testNWFilterEBIPTablesTearOldRules(const void *opaque ATTRIBUTE_UNUSED) ret = 0; cleanup: - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; @@ -224,7 +220,7 @@ testNWFilterEBIPTablesRemoveBasicRules(const void *opaque ATTRIBUTE_UNUSED) char *actual = NULL; int ret = -1; - virCommandSetDryRun(&buf, NULL, NULL); + virTestSetDryRun(&buf, NULL, NULL); if (ebiptables_driver.removeBasicRules("vnet0") < 0) goto cleanup; @@ -242,7 +238,7 @@ testNWFilterEBIPTablesRemoveBasicRules(const void *opaque ATTRIBUTE_UNUSED) ret = 0; cleanup: - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; @@ -258,7 +254,7 @@ testNWFilterEBIPTablesTearNewRules(const void *opaque ATTRIBUTE_UNUSED) char *actual = NULL; int ret = -1; - virCommandSetDryRun(&buf, NULL, NULL); + virTestSetDryRun(&buf, NULL, NULL); if (ebiptables_driver.tearNewRules("vnet0") < 0) goto cleanup; @@ -276,7 +272,7 @@ testNWFilterEBIPTablesTearNewRules(const void *opaque ATTRIBUTE_UNUSED) ret = 0; cleanup: - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; @@ -330,7 +326,7 @@ testNWFilterEBIPTablesApplyBasicRules(const void *opaque ATTRIBUTE_UNUSED) int ret = -1; virMacAddr mac = { .addr = { 0x10, 0x20, 0x30, 0x40, 0x50, 0x60 } }; - virCommandSetDryRun(&buf, NULL, NULL); + virTestSetDryRun(&buf, NULL, NULL); if (ebiptables_driver.applyBasicRules("vnet0", &mac) < 0) goto cleanup; @@ -348,7 +344,7 @@ testNWFilterEBIPTablesApplyBasicRules(const void *opaque ATTRIBUTE_UNUSED) ret = 0; cleanup: - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; @@ -420,7 +416,7 @@ testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *opaque ATTRIBUTE_UNUSED) } }; - virCommandSetDryRun(&buf, NULL, NULL); + virTestSetDryRun(&buf, NULL, NULL); if (ebiptables_driver.applyDHCPOnlyRules("vnet0", &mac, &val, false) < 0) goto cleanup; @@ -438,7 +434,7 @@ testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *opaque ATTRIBUTE_UNUSED) ret = 0; cleanup: - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; @@ -493,7 +489,7 @@ testNWFilterEBIPTablesApplyDropAllRules(const void *opaque ATTRIBUTE_UNUSED) char *actual = NULL; int ret = -1; - virCommandSetDryRun(&buf, NULL, NULL); + virTestSetDryRun(&buf, NULL, NULL); if (ebiptables_driver.applyDropAllRules("vnet0") < 0) goto cleanup; @@ -511,7 +507,7 @@ testNWFilterEBIPTablesApplyDropAllRules(const void *opaque ATTRIBUTE_UNUSED) ret = 0; cleanup: - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virBufferFreeAndReset(&buf); VIR_FREE(actual); return ret; diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c index 043b7d1..6ae0ef7 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -30,8 +30,6 @@ # define __VIR_FIREWALL_PRIV_H_ALLOW__ # include "virfirewallpriv.h" -# define __VIR_COMMAND_PRIV_H_ALLOW__ -# include "vircommandpriv.h" # define VIR_FROM_THIS VIR_FROM_NONE @@ -380,7 +378,7 @@ static int testCompareXMLToArgvFiles(const char *xml, memset(&inst, 0, sizeof(inst)); - virCommandSetDryRun(&buf, NULL, NULL); + virTestSetDryRun(&buf, NULL, NULL); if (!vars) goto cleanup; @@ -401,7 +399,6 @@ static int testCompareXMLToArgvFiles(const char *xml, actualargv = virBufferContentAndReset(&buf); virTestClearCommandPath(actualargv); - virCommandSetDryRun(NULL, NULL, NULL); testRemoveCommonRules(actualargv); @@ -411,6 +408,7 @@ static int testCompareXMLToArgvFiles(const char *xml, ret = 0; cleanup: + virTestSetDryRun(NULL, NULL, NULL); virBufferFreeAndReset(&buf); VIR_FREE(actualargv); virNWFilterInstReset(&inst); diff --git a/tests/testutils.c b/tests/testutils.c index ab938c1..01d9edc 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -48,6 +48,9 @@ #include "virprocess.h" #include "virstring.h" +#define __VIR_COMMAND_PRIV_H_ALLOW__ +#include "vircommandpriv.h" + #ifdef TEST_OOM # ifdef TEST_OOM_TRACE # include <dlfcn.h> @@ -1414,3 +1417,210 @@ const char return virtTestCounterStr; } + + +#define VIR_TEST_DRYRUN_PIPE "/tmp/vir_test_pipe" + +/* According to old virCommandDryRunCallback */ +typedef int (*dryRunCallback)(const char *const*args, + const char *const*env, + const char *input, + const void *opaque); + +typedef struct _dryRunHookData dryRunHookData; +typedef dryRunHookData *dryRunHookDataPtr; + +struct _dryRunHookData +{ + dryRunCallback callback; + void *opaque; + virBufferPtr buffer; + virThreadPtr thread; + int readfd; +}; + +static dryRunHookData hookdata = { NULL, NULL, NULL, NULL, -1 }; + + +/* of virExecHook type */ +static int +dryRunHookForTest(void *opaque, virCommandPtr cmd, int *status) +{ + dryRunHookDataPtr data = opaque; + + virThreadCancel(data->thread); + virThreadJoin(data->thread); + VIR_FREE(data->thread); + if (data->readfd != -1) + VIR_FORCE_CLOSE(data->readfd); + + if (!status) + return -1; + + *status = 0; + + if (data->buffer) { + int fd; + int len = 0; + int pos = 0; + VIR_AUTOFREE(char *) str = NULL; + str = virCommandToString(cmd); + if (!str) + return -1; + + len = strlen(str); + if (len == 0) + return -1; + + if ((fd = open(VIR_TEST_DRYRUN_PIPE, O_WRONLY)) < 0) + return -1; + + while (len > 0) { + int size = len > PIPE_BUF ? PIPE_BUF : len; + if (safewrite(fd, str + pos, size) != size) { + VIR_FORCE_CLOSE(fd); + return -1; + } + pos += size; + len -= size; + } + + if (safewrite(fd, "\n", 1) != 1) { + VIR_FORCE_CLOSE(fd); + return -1; + } + + VIR_FORCE_CLOSE(fd); + } + + if (data->callback) { + *status = data->callback(virCommandGetArgs(cmd), + virCommandGetEnv(cmd), + virCommandGetInputBuffer(cmd), + data->opaque); + } + + /* For dry-run: + * It returns 1 to exit from child in advance */ + return 1; +} + + +static void +dryRunWaitHelper(void *opaque) +{ + int *fd = (int *) opaque; + while (true) { + if ((*fd = open(VIR_TEST_DRYRUN_PIPE, O_RDONLY)) < 0) { + fprintf(stderr, "cannot open dryrun pipe for read\n"); + return; + } + + while (true) { + int ret; + char str[PIPE_BUF]; + memset(str, 0, sizeof(str)); + ret = read(*fd, str, PIPE_BUF); + if (ret < 0) { + fprintf(stderr, "read dryrun pipe error: %d\n", errno); + VIR_FORCE_CLOSE(*fd); + return; + } + + if (ret == 0) + break; + + virBufferAdd(hookdata.buffer, str, ret); + } + + VIR_FORCE_CLOSE(*fd); + } + + /* Never reach here */ +} + + +/** + * virTestSetDryRun: (substitute for old virCommandSetDryRun) + * @buf: buffer to store stringified commands + * @callback: callback to process input/output/args + * @opaque: argument passed to callback + * + * In unit testing, it's desired to not actually run given command, + * but see its string representation without having to change the + * callee. The callee constructs the command and calls it via + * virCommandRun* API. The virTestSetDryRun allows you to + * modify this behavior: once called, every call to + * virCommandRun* results in command string representation being + * appended to @buf instead of being executed. If @callback is + * provided, then it is invoked with the argv, env and stdin + * data string for the command. It is expected to fill the stdout + * and stderr data strings and exit status variables. + * + * The strings stored in @buf are escaped for a shell and + * separated by a newline. For example: + * + * virBuffer buffer = VIR_BUFFER_INITIALIZER; + * virTestSetDryRun(&buffer, NULL, NULL); + * + * virCommandPtr echocmd = virCommandNewArgList("/bin/echo", "Hello world", NULL); + * virCommandRun(echocmd, NULL); + * + * After this, the @buffer should contain: + * + * /bin/echo 'Hello world'\n + * + * To cancel this effect pass NULL for @buf, @callback and @opaque. + * virTestSetDryRun(NULL, NULL, NULL); + * + */ +void +virTestSetDryRun(virBufferPtr buf, void *callback, void *opaque) +{ + if (!buf && !callback && !opaque) { + /* Passing NULL for @buf, @callback and @opaque to cancel dry-run */ + if (hookdata.thread) { + virThreadCancel(hookdata.thread); + virThreadJoin(hookdata.thread); + VIR_FREE(hookdata.thread); + } + + hookdata.buffer = NULL; + hookdata.callback = NULL; + hookdata.opaque = NULL; + if (hookdata.readfd != -1) + VIR_FORCE_CLOSE(hookdata.readfd); + + virCommandSetPreExecHook(NULL, NULL, NULL); + unlink(VIR_TEST_DRYRUN_PIPE); + return; + } + + if (hookdata.buffer || hookdata.callback || hookdata.opaque || hookdata.thread) { + fprintf(stderr, "cannot set dryrun twice buf(%p) cb(%p) opaque(%p) thread(%p)\n", + hookdata.buffer, hookdata.callback, hookdata.opaque, hookdata.thread); + return; + } + + if (hookdata.readfd != -1) + VIR_FORCE_CLOSE(hookdata.readfd); + + if (!virFileExists(VIR_TEST_DRYRUN_PIPE)) { + if (mkfifo(VIR_TEST_DRYRUN_PIPE, 0600) < 0) { + fprintf(stderr, "cannot create dryrun pipe. err: %d\n", errno); + return; + } + } + + if (VIR_ALLOC(hookdata.thread) < 0 || + virThreadCreate(hookdata.thread, true, dryRunWaitHelper, &hookdata.readfd) < 0) { + fprintf(stderr, "cannot create thread for dryrun. err: %d\n", errno); + VIR_FREE(hookdata.thread); + return; + } + + hookdata.buffer = buf; + hookdata.callback = callback; + hookdata.opaque = opaque; + virCommandSetPreExecHook(NULL, dryRunHookForTest, &hookdata); +} diff --git a/tests/testutils.h b/tests/testutils.h index 3bd7bf1..82bfa0a 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -167,4 +167,6 @@ int testCompareDomXML2XMLFiles(virCapsPtr caps, unsigned int parseFlags, testCompareDomXML2XMLResult expectResult); +void virTestSetDryRun(virBufferPtr buf, void *callback, void *opaque); + #endif /* __VIR_TEST_UTILS_H__ */ diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index e6d6874..1bf41c7 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -21,14 +21,12 @@ #include <config.h> #define __VIR_FIREWALL_PRIV_H_ALLOW__ -#define __VIR_COMMAND_PRIV_H_ALLOW__ #include "testutils.h" #if defined(__linux__) # include "virbuffer.h" -# include "vircommandpriv.h" # include "virfirewallpriv.h" # include "virmock.h" # include "virdbuspriv.h" @@ -213,7 +211,7 @@ testFirewallSingleGroup(const void *opaque) goto cleanup; if (data->expectBackend == VIR_FIREWALL_BACKEND_DIRECT) - virCommandSetDryRun(&cmdbuf, NULL, NULL); + virTestSetDryRun(&cmdbuf, NULL, NULL); else fwBuf = &cmdbuf; @@ -249,7 +247,7 @@ testFirewallSingleGroup(const void *opaque) cleanup: virBufferFreeAndReset(&cmdbuf); fwBuf = NULL; - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); return ret; } @@ -273,7 +271,7 @@ testFirewallRemoveRule(const void *opaque) goto cleanup; if (data->expectBackend == VIR_FIREWALL_BACKEND_DIRECT) - virCommandSetDryRun(&cmdbuf, NULL, NULL); + virTestSetDryRun(&cmdbuf, NULL, NULL); else fwBuf = &cmdbuf; @@ -315,7 +313,7 @@ testFirewallRemoveRule(const void *opaque) cleanup: virBufferFreeAndReset(&cmdbuf); fwBuf = NULL; - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); return ret; } @@ -340,7 +338,7 @@ testFirewallManyGroups(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; if (data->expectBackend == VIR_FIREWALL_BACKEND_DIRECT) - virCommandSetDryRun(&cmdbuf, NULL, NULL); + virTestSetDryRun(&cmdbuf, NULL, NULL); else fwBuf = &cmdbuf; @@ -388,19 +386,16 @@ testFirewallManyGroups(const void *opaque ATTRIBUTE_UNUSED) cleanup: virBufferFreeAndReset(&cmdbuf); fwBuf = NULL; - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); return ret; } -static void +static int testFirewallRollbackHook(const char *const*args, const char *const*env ATTRIBUTE_UNUSED, const char *input ATTRIBUTE_UNUSED, - char **output ATTRIBUTE_UNUSED, - char **error ATTRIBUTE_UNUSED, - int *status, - void *opaque ATTRIBUTE_UNUSED) + const void *opaque ATTRIBUTE_UNUSED) { bool isAdd = false; while (*args) { @@ -408,11 +403,11 @@ testFirewallRollbackHook(const char *const*args, if (STREQ(*args, "-A")) { isAdd = true; } else if (isAdd && STREQ(*args, "192.168.122.255")) { - *status = 127; - break; + return 127; } args++; } + return 0; } static int @@ -434,7 +429,7 @@ testFirewallIgnoreFailGroup(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; if (data->expectBackend == VIR_FIREWALL_BACKEND_DIRECT) { - virCommandSetDryRun(&cmdbuf, testFirewallRollbackHook, NULL); + virTestSetDryRun(&cmdbuf, testFirewallRollbackHook, NULL); } else { fwBuf = &cmdbuf; fwError = true; @@ -484,7 +479,7 @@ testFirewallIgnoreFailGroup(const void *opaque ATTRIBUTE_UNUSED) cleanup: virBufferFreeAndReset(&cmdbuf); fwBuf = NULL; - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); return ret; } @@ -509,7 +504,7 @@ testFirewallIgnoreFailRule(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; if (data->expectBackend == VIR_FIREWALL_BACKEND_DIRECT) { - virCommandSetDryRun(&cmdbuf, testFirewallRollbackHook, NULL); + virTestSetDryRun(&cmdbuf, testFirewallRollbackHook, NULL); } else { fwBuf = &cmdbuf; fwError = true; @@ -558,7 +553,7 @@ testFirewallIgnoreFailRule(const void *opaque ATTRIBUTE_UNUSED) cleanup: virBufferFreeAndReset(&cmdbuf); fwBuf = NULL; - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); return ret; } @@ -581,7 +576,7 @@ testFirewallNoRollback(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; if (data->expectBackend == VIR_FIREWALL_BACKEND_DIRECT) { - virCommandSetDryRun(&cmdbuf, testFirewallRollbackHook, NULL); + virTestSetDryRun(&cmdbuf, testFirewallRollbackHook, NULL); } else { fwBuf = &cmdbuf; fwError = true; @@ -629,7 +624,7 @@ testFirewallNoRollback(const void *opaque ATTRIBUTE_UNUSED) cleanup: virBufferFreeAndReset(&cmdbuf); fwBuf = NULL; - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); return ret; } @@ -654,7 +649,7 @@ testFirewallSingleRollback(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; if (data->expectBackend == VIR_FIREWALL_BACKEND_DIRECT) { - virCommandSetDryRun(&cmdbuf, testFirewallRollbackHook, NULL); + virTestSetDryRun(&cmdbuf, testFirewallRollbackHook, NULL); } else { fwError = true; fwBuf = &cmdbuf; @@ -719,7 +714,7 @@ testFirewallSingleRollback(const void *opaque ATTRIBUTE_UNUSED) cleanup: virBufferFreeAndReset(&cmdbuf); fwBuf = NULL; - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); return ret; } @@ -743,7 +738,7 @@ testFirewallManyRollback(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; if (data->expectBackend == VIR_FIREWALL_BACKEND_DIRECT) { - virCommandSetDryRun(&cmdbuf, testFirewallRollbackHook, NULL); + virTestSetDryRun(&cmdbuf, testFirewallRollbackHook, NULL); } else { fwBuf = &cmdbuf; fwError = true; @@ -812,7 +807,7 @@ testFirewallManyRollback(const void *opaque ATTRIBUTE_UNUSED) cleanup: virBufferFreeAndReset(&cmdbuf); fwBuf = NULL; - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); return ret; } @@ -840,7 +835,7 @@ testFirewallChainedRollback(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; if (data->expectBackend == VIR_FIREWALL_BACKEND_DIRECT) { - virCommandSetDryRun(&cmdbuf, testFirewallRollbackHook, NULL); + virTestSetDryRun(&cmdbuf, testFirewallRollbackHook, NULL); } else { fwBuf = &cmdbuf; fwError = true; @@ -935,7 +930,7 @@ testFirewallChainedRollback(const void *opaque ATTRIBUTE_UNUSED) cleanup: virBufferFreeAndReset(&cmdbuf); fwBuf = NULL; - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); return ret; } @@ -967,26 +962,26 @@ static const char *expectedLines[] = { static size_t expectedLineNum; static bool expectedLineError; -static void +static int testFirewallQueryHook(const char *const*args, const char *const*env ATTRIBUTE_UNUSED, const char *input ATTRIBUTE_UNUSED, - char **output, - char **error ATTRIBUTE_UNUSED, - int *status, - void *opaque ATTRIBUTE_UNUSED) + const void *opaque ATTRIBUTE_UNUSED) { if (STREQ(args[0], IPTABLES_PATH) && STREQ(args[1], "-L")) { - if (VIR_STRDUP(*output, TEST_FILTER_TABLE_LIST) < 0) - *status = 127; + if (safewrite(STDOUT_FILENO, TEST_FILTER_TABLE_LIST, + strlen(TEST_FILTER_TABLE_LIST)) < 0) + return 127; } else if (STREQ(args[0], IPTABLES_PATH) && STREQ(args[1], "-t") && STREQ(args[2], "nat") && STREQ(args[3], "-L")) { - if (VIR_STRDUP(*output, TEST_NAT_TABLE_LIST) < 0) - *status = 127; + if (safewrite(STDOUT_FILENO, TEST_NAT_TABLE_LIST, + strlen(TEST_NAT_TABLE_LIST)) < 0) + return 127; } + return 0; } @@ -1044,7 +1039,7 @@ testFirewallQuery(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; if (data->expectBackend == VIR_FIREWALL_BACKEND_DIRECT) { - virCommandSetDryRun(&cmdbuf, testFirewallQueryHook, NULL); + virTestSetDryRun(&cmdbuf, testFirewallQueryHook, NULL); } else { fwBuf = &cmdbuf; fwError = true; @@ -1118,7 +1113,7 @@ testFirewallQuery(const void *opaque ATTRIBUTE_UNUSED) cleanup: virBufferFreeAndReset(&cmdbuf); fwBuf = NULL; - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virFirewallFree(fw); return ret; } diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c index 4fd7ff6..11a2a54 100644 --- a/tests/viriscsitest.c +++ b/tests/viriscsitest.c @@ -19,6 +19,7 @@ */ #include <config.h> +#include <fcntl.h> #include "testutils.h" @@ -29,9 +30,6 @@ main(void) return EXIT_AM_SKIP; } #else -# define __VIR_COMMAND_PRIV_H_ALLOW__ - -# include "vircommandpriv.h" # include "viriscsi.h" # define VIR_FROM_THIS VIR_FROM_NONE @@ -72,27 +70,40 @@ const char *iscsiadmIfaceIfaceOutput = struct testIscsiadmCbData { bool output_version; - bool iface_created; + char *result_path; }; -static void testIscsiadmCb(const char *const*args, - const char *const*env ATTRIBUTE_UNUSED, - const char *input ATTRIBUTE_UNUSED, - char **output, - char **error ATTRIBUTE_UNUSED, - int *status, - void *opaque) +static int testIscsiadmCb(const char *const*args, + const char *const*env ATTRIBUTE_UNUSED, + const char *input ATTRIBUTE_UNUSED, + const void *opaque) { - struct testIscsiadmCbData *data = opaque; + int fd; + int iface_created = 0; + const struct testIscsiadmCbData *data = opaque; + + if (data) { + fd = open(data->result_path, O_RDONLY); + if (fd < 0) + return -1; + + if (read(fd, &iface_created, sizeof(int)) != sizeof(int)) { + VIR_FORCE_CLOSE(fd); + return -1; + } + VIR_FORCE_CLOSE(fd); + } if (args[0] && STREQ(args[0], ISCSIADM) && args[1] && STREQ(args[1], "--mode") && args[2] && STREQ(args[2], "session") && args[3] == NULL) { if (data->output_version) - ignore_value(VIR_STRDUP(*output, iscsiadmSessionOutputNonFlash)); + ignore_value(safewrite(STDOUT_FILENO, iscsiadmSessionOutputNonFlash, + strlen(iscsiadmSessionOutputNonFlash))); else - ignore_value(VIR_STRDUP(*output, iscsiadmSessionOutput)); + ignore_value(safewrite(STDOUT_FILENO, iscsiadmSessionOutput, + strlen(iscsiadmSessionOutput))); } else if (args[0] && STREQ(args[0], ISCSIADM) && args[1] && STREQ(args[1], "--mode") && args[2] && STREQ(args[2], "discovery") && @@ -103,7 +114,8 @@ static void testIscsiadmCb(const char *const*args, args[7] && STREQ(args[7], "--op") && args[8] && STREQ(args[8], "nonpersistent") && args[9] == NULL) { - ignore_value(VIR_STRDUP(*output, iscsiadmSendtargetsOutput)); + ignore_value(safewrite(STDOUT_FILENO, iscsiadmSendtargetsOutput, + strlen(iscsiadmSendtargetsOutput))); } else if (args[0] && STREQ(args[0], ISCSIADM) && args[1] && STREQ(args[1], "--mode") && args[2] && STREQ(args[2], "node") && @@ -127,10 +139,12 @@ static void testIscsiadmCb(const char *const*args, args[1] && STREQ(args[1], "--mode") && args[2] && STREQ(args[2], "iface") && args[3] == NULL) { - if (data->iface_created) - ignore_value(VIR_STRDUP(*output, iscsiadmIfaceIfaceOutput)); + if (iface_created) + ignore_value(safewrite(STDOUT_FILENO, iscsiadmIfaceIfaceOutput, + strlen(iscsiadmIfaceIfaceOutput))); else - ignore_value(VIR_STRDUP(*output, iscsiadmIfaceDefaultOutput)); + ignore_value(safewrite(STDOUT_FILENO, iscsiadmIfaceDefaultOutput, + strlen(iscsiadmIfaceDefaultOutput))); } else if (args[0] && STREQ(args[0], ISCSIADM) && args[1] && STREQ(args[1], "--mode") && args[2] && STREQ(args[2], "iface") && @@ -144,7 +158,18 @@ static void testIscsiadmCb(const char *const*args, * * New interface libvirt-iface-03020100 added */ - data->iface_created = true; + if (data) { + iface_created = 1; + fd = open(data->result_path, O_WRONLY); + if (fd < 0) + return -1; + + if (safewrite(fd, &iface_created, sizeof(int)) != sizeof(int)) { + VIR_FORCE_CLOSE(fd); + return -1; + } + VIR_FORCE_CLOSE(fd); + } } else if (args[0] && STREQ(args[0], ISCSIADM) && args[1] && STREQ(args[1], "--mode") && args[2] && STREQ(args[2], "iface") && @@ -157,7 +182,7 @@ static void testIscsiadmCb(const char *const*args, args[9] && STREQ(args[9], "--value") && args[10] && STREQ(args[10], "iqn.2004-06.example:example1:initiator") && args[11] == NULL && - data->iface_created) { + iface_created) { /* Mocking real environment output is not needed for now. * Example output from real environment: * @@ -173,8 +198,9 @@ static void testIscsiadmCb(const char *const*args, args[7] && STREQ(args[7], "--interface") && args[8] && STREQ(args[8], "libvirt-iface-03020100") && args[9] == NULL && - data->iface_created) { - ignore_value(VIR_STRDUP(*output, iscsiadmSendtargetsOutput)); + iface_created) { + ignore_value(safewrite(STDOUT_FILENO, iscsiadmSendtargetsOutput, + strlen(iscsiadmSendtargetsOutput))); } else if (args[0] && STREQ(args[0], ISCSIADM) && args[1] && STREQ(args[1], "--mode") && args[2] && STREQ(args[2], "node") && @@ -186,7 +212,7 @@ static void testIscsiadmCb(const char *const*args, args[8] && STREQ(args[8], "--interface") && args[9] && STREQ(args[9], "libvirt-iface-03020100") && args[10] == NULL && - data->iface_created) { + iface_created) { /* Mocking real environment output is not needed for now. * Example output from real environment: * @@ -198,10 +224,31 @@ static void testIscsiadmCb(const char *const*args, * portal: 10.20.30.40:3260,1] successful. */ } else { - *status = -1; + return -1; } + return 0; } + +static int +testCreateTempFile(char *path) +{ + int iface_created = 0; + int fd = -1; + if ((fd = mkostemp(path, O_RDWR)) < 0) + return -1; + + if (safewrite(fd, &iface_created, sizeof(int)) != sizeof(int)) { + VIR_FORCE_CLOSE(fd); + unlink(path); + return -1; + } + + VIR_FORCE_CLOSE(fd); + return 0; +} + + struct testSessionInfo { const char *device_path; bool output_version; @@ -215,10 +262,15 @@ testISCSIGetSession(const void *data) struct testIscsiadmCbData cbData = { 0 }; char *actual_session = NULL; int ret = -1; + char path[] = "/dev/shm/testiscsi.XXXXXX"; + if (testCreateTempFile(path) < 0) + return -1; + + cbData.result_path = path; cbData.output_version = info->output_version; - virCommandSetDryRun(NULL, testIscsiadmCb, &cbData); + virTestSetDryRun(NULL, testIscsiadmCb, &cbData); actual_session = virISCSIGetSession(info->device_path, true); @@ -233,7 +285,8 @@ testISCSIGetSession(const void *data) ret = 0; cleanup: - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); + unlink(path); VIR_FREE(actual_session); return ret; } @@ -254,7 +307,7 @@ testISCSIScanTargets(const void *data) int ret = -1; size_t i; - virCommandSetDryRun(NULL, testIscsiadmCb, NULL); + virTestSetDryRun(NULL, testIscsiadmCb, NULL); if (virISCSIScanTargets(info->portal, NULL, false, &ntargets, &targets) < 0) @@ -279,7 +332,7 @@ testISCSIScanTargets(const void *data) ret = 0; cleanup: - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); for (i = 0; i < ntargets; i++) VIR_FREE(targets[i]); VIR_FREE(targets); @@ -300,15 +353,21 @@ testISCSIConnectionLogin(const void *data) const struct testConnectionInfoLogin *info = data; struct testIscsiadmCbData cbData = { 0 }; int ret = -1; + char path[] = "/dev/shm/testiscsi.XXXXXX"; + + if (testCreateTempFile(path) < 0) + return -1; - virCommandSetDryRun(NULL, testIscsiadmCb, &cbData); + cbData.result_path = path; + virTestSetDryRun(NULL, testIscsiadmCb, &cbData); if (virISCSIConnectionLogin(info->portal, info->initiatoriqn, info->target) < 0) goto cleanup; ret = 0; cleanup: - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); + unlink(path); return ret; } @@ -362,7 +421,6 @@ mymain(void) DO_LOGIN_TEST("10.20.30.40:3260,1", NULL, "iqn.2004-06.example:example1:iscsi.test"); DO_LOGIN_TEST("10.20.30.40:3260,1", "iqn.2004-06.example:example1:initiator", "iqn.2004-06.example:example1:iscsi.test"); - if (rv < 0) return EXIT_FAILURE; return EXIT_SUCCESS; diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c index b153e07..408e338 100644 --- a/tests/virkmodtest.c +++ b/tests/virkmodtest.c @@ -23,8 +23,6 @@ #ifdef __linux__ # include <stdlib.h> -# define __VIR_COMMAND_PRIV_H_ALLOW__ -# include "vircommandpriv.h" # include "virkmod.h" # include "virstring.h" @@ -96,7 +94,7 @@ testKModLoad(const void *args) bool useBlacklist = info->useBlacklist; virBuffer buf = VIR_BUFFER_INITIALIZER; - virCommandSetDryRun(&buf, NULL, NULL); + virTestSetDryRun(&buf, NULL, NULL); errbuf = virKModLoad(module, useBlacklist); if (errbuf) { @@ -110,7 +108,7 @@ testKModLoad(const void *args) ret = 0; cleanup: - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); VIR_FREE(errbuf); return ret; } @@ -125,7 +123,7 @@ testKModUnload(const void *args) const char *module = info->module; virBuffer buf = VIR_BUFFER_INITIALIZER; - virCommandSetDryRun(&buf, NULL, NULL); + virTestSetDryRun(&buf, NULL, NULL); errbuf = virKModUnload(module); if (errbuf) { @@ -139,7 +137,7 @@ testKModUnload(const void *args) ret = 0; cleanup: - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); VIR_FREE(errbuf); return ret; } diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 72bfeff..62cb044 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -21,8 +21,6 @@ #include <config.h> #include "testutils.h" -#define __VIR_COMMAND_PRIV_H_ALLOW__ -#include "vircommandpriv.h" #include "virnetdevbandwidth.h" #include "netdev_bandwidth_conf.c" @@ -79,7 +77,7 @@ testVirNetDevBandwidthSet(const void *data) if (!iface) iface = "eth0"; - virCommandSetDryRun(&buf, NULL, NULL); + virTestSetDryRun(&buf, NULL, NULL); if (virNetDevBandwidthSet(iface, band, info->hierarchical_class, true) < 0) goto cleanup; @@ -103,7 +101,7 @@ testVirNetDevBandwidthSet(const void *data) ret = 0; cleanup: - virCommandSetDryRun(NULL, NULL, NULL); + virTestSetDryRun(NULL, NULL, NULL); virNetDevBandwidthFree(band); virBufferFreeAndReset(&buf); VIR_FREE(actual_cmd); -- 2.7.4

3 2

[libvirt] [PATCH] qemu: fix error message on directory creation
by Eric Blake 22 Aug '18

22 Aug '18

Minor copy-and-paste bug present since commit 462c74c3, in Apr 2010. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing this under the trivial rule. src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 21e9e87ddd..da8c4e8991 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -656,7 +656,7 @@ qemuStateInitialize(bool privileged, goto error; } if (virFileMakePath(cfg->snapshotDir) < 0) { - virReportSystemError(errno, _("Failed to create save dir %s"), + virReportSystemError(errno, _("Failed to create snapshot dir %s"), cfg->snapshotDir); goto error; } -- 2.17.1

1 0

[libvirt] [PATCH 0/3] qemu: Fix few issues from the -blockdev series
by Peter Krempa 22 Aug '18

22 Aug '18

All three should appease coverity. Peter Krempa (3): qemu: hotplug: Don't generate alias when detaching controllers qemu: hotplug: Don't leak 'nodename' in qemuDomainChangeMediaBlockdev qemu: monitor: Fix device matching in qemuMonitorJSONBlockIoThrottleInfo src/qemu/qemu_hotplug.c | 6 +----- src/qemu/qemu_monitor_json.c | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) -- 2.16.2

2 4

[libvirt] [PATCHv2 00/62] qemu: Add support for -blockdev
by Peter Krempa 22 Aug '18

22 Aug '18

In this version everything except blockjobs should work properly. Similarly to the previous posting, the block job support is not part of this posting yet so blockjobs will not work. Changes to v1: - Added support for floppies via -device so they work with blockdev - fixed return value from the new media changing API - fixed handling of the TRAY_MOVED and BLOCK_IO_ERROR events - fixed two compilation problems with nitpicky compilers - refactored/fixed setup of backing chain for disk media change - fixed two regressions when filling stats hash tables without -blockdev - fixed alias reported in the TRAY_MOVED event to the users - added helper to retrieve a disk definition from a VM by alias or QOM path Note that the bump of the capability data needs to be fixed since jansson support was reverted. For the quirks of specifying floppies via -device please refer to commit 30/62 qemu: command: Setup floppy drives via -device for blockdev Peter Krempa (62): qemu: process: Fix alias for disk-tray-moved event tests: qemumonitorjson: Simplify debugging of 'blockInfo' test qemu: Improve errors in qemuDomainBlockResize qemu: monitor: Remove unsupported function check for 'block_resize' qemu: monitor: Remove useless 'locked' property from struct qemuDomainDiskInfo tests: qemucapabilities: Update capability data for qemu 3.0.0 Revert "qemu: monitor: Add the 'query-nodes' argument for query-blockstats" qemu: hotplug: consolidate media change code paths qemu: hotplug: Prepare disk source in qemuDomainAttachDeviceDiskLive qemu: monitor: Reuse qemuMonitorJSONQueryBlock in qemuMonitorJSONBlockIoThrottleInfo qemu: monitor: Allow using 'id' instead of 'device' for 'block_set_io_throttle' qemu: monitor: Allow using 'qdev' instead of 'device' for getting disk throttling qemu: monitor: Add 'nodename' argument for 'block_resize' tests: qemu: Drop disk from hostdev-mdev tests tests: qemuxml2argv: Fork CAPS_LATEST test cases for 'blockdev' tests: qemu: Add test data for backing chains and indexes qemu: hotplug: Don't generate alias when detaching disk util: virqemu: Simplify debugging if building QOM object with missing args qemu: caps: Add capability for using the blockdev infrastructure qemu: process: clear QEMU_CAPS_BLOCKDEV for VMs with SD card qemu: domain: Don't redetect backing chain when using -blockdev qemu: process: Don't detect nodenames when we support -blockdev conf: domain: Format out user provided backing chains in XML qemu: domain: Add infrastructure to generate block node names conf: Implement private data formatting and parsing for disks conf: Allow formatting and parsing of 'index' for disk source image qemu: Use proper backingIndex when reporting stats for backing chain qemu: Add field to store QDEV path of a disk in private data qemu: alias: Generate QDEV name of the block backend for disks qemu: command: Setup floppy drives via -device for blockdev qemu: domain: Add field for storing node name for copy-on-read qemu: proces: assign node names for user defined backing chains qemu: block: Add generator for the 'copy-on-read' blockdev driver qemu: domain: Prepare qemuDomainDiskGetBackendAlias for -blockdev qemu: command: format disk source commandline for -blockdev qemu: command: Add helper to check if disk throttling is enabled qemu: process: Setup disk io throttling for -blockdev qemu: driver: Use QOM backend name for disk IO throttling APIs qemu: driver: Prepare qemuDomainBlockResize for blockdev qemu: process: Add lookup via QOM id to qemuProcessFindDomainDiskByAlias qemu: monitor: Handle TRAY_MOVED event correctly with -blockdev qemu: monitor: Handle BLOCK_IO_ERROR event properly with -blockdev qemu: hotplug: Prepare for blockdev-add/blockdev-del with backing chains qemu: monitor: Add APIs for cdrom tray handling for -blockdev qemu: hotplug: Implement removable media change for -blockdev qemu: driver: Don't copy disk alias in qemuDomainBlocksStatsGather qemu: Explicitly find disks for stats totals qemu: monitor: Retrieve blockstats also by qdev and node-names qemu: monitor: Add APIs for refreshing disk capacity when using -blockdev qemu: driver: Don't pass 'virDomainDiskDefPtr' to qemuDomainGetStatsOneBlock qemu: monitor: Extract 'write-threshold' automatically for -blockdev qemu: Extract exporting of disk block statistics qemu: Extract exporting of the header for block stats qemu: Export stats relevant for the frontend separately qemu: Refactor control flow in qemuDomainGetStatsBlockExportDisk qemu: Report frontend stats only for the frontend entry qemu: Export stats relevant for the storage backend qemu: monitor: Report data also for 'qdev' entry in qemuMonitorJSONGetBlockInfo qemu: Use QOM path with query-block when using -blockdev qemu: driver: Allow using blockdev with qemuDomainBlocksStatsGather qemu: driver: Prepare qemuDomainGetStatsBlock (bulk disk stats) for -blockdev DO NOT APPLY: Enable QEMU_CAPS_BLOCKDEV if 'query-blockstats' works with -blockdev docs/formatdomain.html.in | 7 +- docs/schemas/domaincommon.rng | 19 + src/conf/domain_conf.c | 89 +++- src/conf/domain_conf.h | 7 + src/qemu/qemu_alias.c | 86 ++- src/qemu/qemu_alias.h | 3 +- src/qemu/qemu_block.c | 24 +- src/qemu/qemu_block.h | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 134 ++++- src/qemu/qemu_command.h | 3 + src/qemu/qemu_domain.c | 174 +++++- src/qemu/qemu_domain.h | 10 +- src/qemu/qemu_driver.c | 442 ++++++++++----- src/qemu/qemu_hotplug.c | 208 ++++++-- src/qemu/qemu_hotplug.h | 9 +- src/qemu/qemu_monitor.c | 104 +++- src/qemu/qemu_monitor.h | 37 +- src/qemu/qemu_monitor_json.c | 411 +++++++++++--- src/qemu/qemu_monitor_json.h | 33 +- src/qemu/qemu_process.c | 138 ++++- src/qemu/qemu_process.h | 5 +- src/util/virqemu.c | 5 +- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 591 +++------------------ tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 9 +- tests/qemuhotplugtest.c | 2 +- tests/qemumonitorjsontest.c | 34 +- tests/qemustatusxml2xmldata/modern-in.xml | 6 + tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args | 37 ++ tests/qemuxml2argvdata/disk-aio.x86_64-latest.args | 19 +- .../disk-backing-chains-index.x86_64-2.12.0.args | 1 + .../disk-backing-chains-index.x86_64-latest.args | 1 + .../qemuxml2argvdata/disk-backing-chains-index.xml | 145 +++++ .../disk-backing-chains-noindex.x86_64-2.12.0.args | 58 ++ .../disk-backing-chains-noindex.x86_64-latest.args | 163 ++++++ .../disk-backing-chains-noindex.xml | 145 +++++ .../qemuxml2argvdata/disk-cache.x86_64-2.12.0.args | 50 ++ .../qemuxml2argvdata/disk-cache.x86_64-latest.args | 50 +- .../disk-cdrom-network.x86_64-2.12.0.args | 41 ++ .../disk-cdrom-network.x86_64-latest.args | 32 +- .../disk-cdrom-tray.x86_64-2.12.0.args | 39 ++ .../disk-cdrom-tray.x86_64-latest.args | 24 +- .../qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args | 35 ++ .../qemuxml2argvdata/disk-cdrom.x86_64-latest.args | 17 +- .../disk-copy_on_read.x86_64-2.12.0.args | 41 ++ .../disk-copy_on_read.x86_64-latest.args | 19 +- .../disk-detect-zeroes.x86_64-2.12.0.args | 37 ++ .../disk-detect-zeroes.x86_64-latest.args | 17 +- .../disk-error-policy.x86_64-2.12.0.args | 41 ++ .../disk-error-policy.x86_64-latest.args | 30 +- .../disk-floppy-q35-2_11.x86_64-2.12.0.args | 35 ++ .../disk-floppy-q35-2_11.x86_64-latest.args | 14 +- .../disk-floppy-q35-2_9.x86_64-2.12.0.args | 35 ++ .../disk-floppy-q35-2_9.x86_64-latest.args | 14 +- .../disk-floppy.x86_64-2.12.0.args | 35 ++ .../disk-floppy.x86_64-latest.args | 21 +- .../disk-network-gluster.x86_64-2.12.0.args | 44 ++ .../disk-network-gluster.x86_64-latest.args | 32 +- .../disk-network-iscsi.x86_64-2.12.0.args | 63 +++ .../disk-network-iscsi.x86_64-latest.args | 58 +- .../disk-network-nbd.x86_64-2.12.0.args | 46 ++ .../disk-network-nbd.x86_64-latest.args | 41 +- .../disk-network-rbd.x86_64-2.12.0.args | 61 +++ .../disk-network-rbd.x86_64-latest.args | 67 ++- .../disk-network-sheepdog.x86_64-2.12.0.args | 35 ++ .../disk-network-sheepdog.x86_64-latest.args | 16 +- .../disk-network-source-auth.x86_64-2.12.0.args | 47 ++ .../disk-network-source-auth.x86_64-latest.args | 30 +- .../disk-network-tlsx509.x86_64-2.12.0.args | 59 ++ .../disk-network-tlsx509.x86_64-latest.args | 61 ++- .../disk-readonly-disk.x86_64-2.12.0.args | 34 ++ .../disk-readonly-disk.x86_64-latest.args | 14 +- .../disk-shared.x86_64-2.12.0.args | 37 ++ .../disk-shared.x86_64-latest.args | 18 +- ...isk-virtio-scsi-reservations.x86_64-2.12.0.args | 43 ++ ...isk-virtio-scsi-reservations.x86_64-latest.args | 20 +- .../floppy-drive-fat.x86_64-2.12.0.args | 33 ++ .../floppy-drive-fat.x86_64-latest.args | 7 +- .../hostdev-mdev-display-missing-graphics.xml | 6 - ...v-display-spice-egl-headless.x86_64-latest.args | 2 - .../hostdev-mdev-display-spice-egl-headless.xml | 6 - ...ev-mdev-display-spice-opengl.x86_64-latest.args | 2 - .../hostdev-mdev-display-spice-opengl.xml | 6 - ...dev-display-vnc-egl-headless.x86_64-latest.args | 2 - .../hostdev-mdev-display-vnc-egl-headless.xml | 6 - .../hostdev-mdev-display-vnc.x86_64-latest.args | 2 - .../qemuxml2argvdata/hostdev-mdev-display-vnc.xml | 6 - tests/qemuxml2argvdata/hostdev-mdev-display.xml | 6 - .../hostdev-mdev-invalid-target-address.xml | 5 - .../qemuxml2argvdata/hostdev-mdev-precreated.args | 3 - tests/qemuxml2argvdata/hostdev-mdev-precreated.xml | 6 - .../hostdev-mdev-src-address-invalid.xml | 6 - tests/qemuxml2argvtest.c | 26 + .../disk-backing-chains-inactive.xml | 35 ++ .../disk-backing-chains-index-active.xml | 156 ++++++ .../disk-backing-chains-index-inactive.xml | 156 ++++++ .../disk-backing-chains-noindex-active.xml | 156 ++++++ .../disk-backing-chains-noindex-inactive.xml | 156 ++++++ tests/qemuxml2xmloutdata/disk-mirror-inactive.xml | 4 + .../disk-mirror-old-inactive.xml | 4 + tests/qemuxml2xmloutdata/hostdev-mdev-display.xml | 6 - .../qemuxml2xmloutdata/hostdev-mdev-precreated.xml | 6 - tests/qemuxml2xmltest.c | 2 + 104 files changed, 4259 insertions(+), 1169 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args create mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args create mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.xml create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.xml create mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args create mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml create mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml create mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-noindex-active.xml create mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-noindex-inactive.xml -- 2.16.2

4 132

[libvirt] [PATCH v3 0/3] vsh: Introduce new API for printing tables
by Simon Kobyda 22 Aug '18

22 Aug '18

Created new API for priting tables, mainly to solve alignment problems. Implemented these test to virsh list. In the future, API may be everywhere in virsh and virt-admin. Also wrote basic tests for the new API, and corrected tests in virshtest which are influenced by implementation of the API in virsh list. Changes in v3: - changed encoding of 3/3 patch, otherwise it cannot be applied Changes in v2: - added tests - fixed alignment for unicode character which span more spaces - moved ncolumns check to vshTableRowAppend - changed arguments for functions vshTablePrint, vshTablePrintToStdout, vshTablePrintToString Simon Kobyda (3): vsh: Add API for printing tables. virsh: Implement new table API for virsh list vsh: Added tests tests/Makefile.am | 8 + tests/virshtest.c | 14 +- tests/vshtabletest.c | 247 +++++++++++++++++++++ tools/Makefile.am | 4 +- tools/virsh-domain-monitor.c | 43 ++-- tools/vsh-table.c | 413 +++++++++++++++++++++++++++++++++++ tools/vsh-table.h | 42 ++++ 7 files changed, 744 insertions(+), 27 deletions(-) create mode 100644 tests/vshtabletest.c create mode 100644 tools/vsh-table.c create mode 100644 tools/vsh-table.h -- 2.17.1

4 12

[libvirt] [PATCH 0/3] ui: remove deprecated UI frontends
by Daniel P. Berrangé 22 Aug '18

22 Aug '18

We deprecated GTK2 and SDL1.2 in the 2.12.0 release, so they are able to be removed entirely in the 3.1.0 release. The min GTK3 version can also be bumped up based the distros we aim to support. Daniel P. Berrangé (3): ui: remove support for GTK2 in favour of GTK3 ui: increase min required GTK3 version to 3.14.0 ui: remove support for SDL1.2 in favour of SDL2 configure | 111 +---- include/ui/gtk.h | 9 - qemu-deprecated.texi | 16 - ui/Makefile.objs | 5 - ui/gtk-egl.c | 10 +- ui/gtk.c | 202 +------- ui/sdl.c | 1027 ---------------------------------------- ui/sdl_zoom.c | 93 ---- ui/sdl_zoom.h | 25 - ui/sdl_zoom_template.h | 219 --------- 10 files changed, 33 insertions(+), 1684 deletions(-) delete mode 100644 ui/sdl.c delete mode 100644 ui/sdl_zoom.c delete mode 100644 ui/sdl_zoom.h delete mode 100644 ui/sdl_zoom_template.h -- 2.17.1

3 9

[libvirt] [PATCH] qemu: Start domain on a node without cpu affinity
by Roman Bolshakov 22 Aug '18

22 Aug '18

libvirt affinity wrappers don't support macOS Thread Affinity API: https://developer.apple.com/library/archive/releasenotes/Performance/RN-Aff… virProcessSetAffinity stub prevents libvirt from starting a qemu domain on macOS: $ virsh start vm error: Failed to start domain vm error: Process CPU affinity is not supported on this platform: Function not implemented With the patch a VM can be started on macOS but some affinity-related commands will return errors: $ virsh vcpuinfo vm error: Requested operation is not valid: cpu affinity is not supported $ virsh vcpupin vm VCPU: CPU Affinity ---------------------------------- 0: 0-7 $ virsh vcpupin vm --live --vcpu 0 --cpulist 7 error: operation failed: Virt type 'qemu' does not support vCPU pinning $ virsh emulatorpin vm emulator: CPU Affinity ---------------------------------- *: 0-7 $ virsh emulatorpin vm --live --cpulist 7 error: Requested operation is not valid: cpu affinity is not supported The patch also fixes virmacmaptest on macOS Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- src/qemu/qemu_driver.c | 6 ++++++ src/util/virprocess.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 21e9e87ddd..2e225b1ede 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5245,6 +5245,12 @@ qemuDomainPinEmulator(virDomainPtr dom, if (virDomainPinEmulatorEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; + if (!qemuDomainHasVcpuPids(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("cpu affinity is not supported")); + goto cleanup; + } + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 3988f5546c..7eaafd29f2 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -598,7 +598,7 @@ int virProcessSetAffinity(pid_t pid ATTRIBUTE_UNUSED, { virReportSystemError(ENOSYS, "%s", _("Process CPU affinity is not supported on this platform")); - return -1; + return 0; } virBitmapPtr -- 2.15.2 (Apple Git-101.1)

3 2

[libvirt] [jenkins-ci PATCH v2 00/13] lcitool: Add 'build' action
by Andrea Bolognani 22 Aug '18

22 Aug '18

Changes from [v1]: * rebase on top of master (985ab833be9b) and integrate recent changes to build rules on the Jenkins side; * build on more targets. [v1] https://www.redhat.com/archives/libvir-list/2018-August/msg00393.html Andrea Bolognani (13): projects: Add default machines for libvirt-dbus jobs: Rename git-url -> git_url jobs: Remove archive_format from defaults jobs: Move some parameters from jobs to defaults jobs: Declare empty values consistently guests: Add build jobs guests: Add build projects guests: Add build playbook lcitool: Make playbook execution generic lcitool: Add 'build' action lcitool: Support building arbitrary branches guests: Support building on more targets lcitool: Document build action guests/README.markdown | 19 +++ guests/lcitool | 109 ++++++++++-------- .../build/jobs/autotools-build-job.yml | 15 +++ .../build/jobs/autotools-check-job.yml | 16 +++ .../build/jobs/autotools-rpm-job.yml | 17 +++ .../build/jobs/autotools-syntax-check-job.yml | 12 ++ guests/playbooks/build/jobs/defaults.yml | 37 ++++++ .../build/jobs/generic-build-job.yml | 11 ++ .../build/jobs/generic-check-job.yml | 11 ++ .../playbooks/build/jobs/generic-rpm-job.yml | 11 ++ .../build/jobs/generic-syntax-check-job.yml | 11 ++ guests/playbooks/build/jobs/go-build-job.yml | 11 ++ guests/playbooks/build/jobs/go-check-job.yml | 11 ++ .../build/jobs/perl-modulebuild-build-job.yml | 13 +++ .../build/jobs/perl-modulebuild-check-job.yml | 11 ++ .../build/jobs/perl-modulebuild-rpm-job.yml | 16 +++ guests/playbooks/build/jobs/prepare.yml | 19 +++ .../build/jobs/python-distutils-build-job.yml | 13 +++ .../build/jobs/python-distutils-check-job.yml | 11 ++ .../build/jobs/python-distutils-rpm-job.yml | 12 ++ guests/playbooks/build/main.yml | 16 +++ guests/playbooks/build/projects/libosinfo.yml | 36 ++++++ .../playbooks/build/projects/libvirt-cim.yml | 10 ++ .../playbooks/build/projects/libvirt-dbus.yml | 44 +++++++ .../playbooks/build/projects/libvirt-glib.yml | 38 ++++++ .../build/projects/libvirt-go-xml.yml | 13 +++ .../playbooks/build/projects/libvirt-go.yml | 13 +++ .../playbooks/build/projects/libvirt-perl.yml | 19 +++ .../build/projects/libvirt-python.yml | 13 +++ .../build/projects/libvirt-sandbox.yml | 27 +++++ .../playbooks/build/projects/libvirt-tck.yml | 27 +++++ guests/playbooks/build/projects/libvirt.yml | 55 +++++++++ .../build/projects/osinfo-db-tools.yml | 36 ++++++ guests/playbooks/build/projects/osinfo-db.yml | 23 ++++ .../playbooks/build/projects/virt-manager.yml | 39 +++++++ .../playbooks/build/projects/virt-viewer.yml | 38 ++++++ jobs/autotools.yaml | 3 +- jobs/defaults.yaml | 8 +- jobs/generic.yaml | 3 +- jobs/go.yaml | 3 +- jobs/perl-modulebuild.yaml | 3 +- jobs/python-distutils.yaml | 3 +- projects/libosinfo.yaml | 3 +- projects/libvirt-cim.yaml | 3 +- projects/libvirt-dbus.yaml | 18 +-- projects/libvirt-glib.yaml | 3 +- projects/libvirt-go-xml.yaml | 3 +- projects/libvirt-go.yaml | 3 +- projects/libvirt-perl.yaml | 3 +- projects/libvirt-python.yaml | 3 +- projects/libvirt-sandbox.yaml | 3 +- projects/libvirt-tck.yaml | 3 +- projects/libvirt.yaml | 2 +- projects/osinfo-db-tools.yaml | 3 +- projects/osinfo-db.yaml | 2 +- projects/virt-manager.yaml | 3 +- projects/virt-viewer.yaml | 3 +- 57 files changed, 832 insertions(+), 82 deletions(-) create mode 100644 guests/playbooks/build/jobs/autotools-build-job.yml create mode 100644 guests/playbooks/build/jobs/autotools-check-job.yml create mode 100644 guests/playbooks/build/jobs/autotools-rpm-job.yml create mode 100644 guests/playbooks/build/jobs/autotools-syntax-check-job.yml create mode 100644 guests/playbooks/build/jobs/defaults.yml create mode 100644 guests/playbooks/build/jobs/generic-build-job.yml create mode 100644 guests/playbooks/build/jobs/generic-check-job.yml create mode 100644 guests/playbooks/build/jobs/generic-rpm-job.yml create mode 100644 guests/playbooks/build/jobs/generic-syntax-check-job.yml create mode 100644 guests/playbooks/build/jobs/go-build-job.yml create mode 100644 guests/playbooks/build/jobs/go-check-job.yml create mode 100644 guests/playbooks/build/jobs/perl-modulebuild-build-job.yml create mode 100644 guests/playbooks/build/jobs/perl-modulebuild-check-job.yml create mode 100644 guests/playbooks/build/jobs/perl-modulebuild-rpm-job.yml create mode 100644 guests/playbooks/build/jobs/prepare.yml create mode 100644 guests/playbooks/build/jobs/python-distutils-build-job.yml create mode 100644 guests/playbooks/build/jobs/python-distutils-check-job.yml create mode 100644 guests/playbooks/build/jobs/python-distutils-rpm-job.yml create mode 100644 guests/playbooks/build/main.yml create mode 100644 guests/playbooks/build/projects/libosinfo.yml create mode 100644 guests/playbooks/build/projects/libvirt-cim.yml create mode 100644 guests/playbooks/build/projects/libvirt-dbus.yml create mode 100644 guests/playbooks/build/projects/libvirt-glib.yml create mode 100644 guests/playbooks/build/projects/libvirt-go-xml.yml create mode 100644 guests/playbooks/build/projects/libvirt-go.yml create mode 100644 guests/playbooks/build/projects/libvirt-perl.yml create mode 100644 guests/playbooks/build/projects/libvirt-python.yml create mode 100644 guests/playbooks/build/projects/libvirt-sandbox.yml create mode 100644 guests/playbooks/build/projects/libvirt-tck.yml create mode 100644 guests/playbooks/build/projects/libvirt.yml create mode 100644 guests/playbooks/build/projects/osinfo-db-tools.yml create mode 100644 guests/playbooks/build/projects/osinfo-db.yml create mode 100644 guests/playbooks/build/projects/virt-manager.yml create mode 100644 guests/playbooks/build/projects/virt-viewer.yml -- 2.17.1

2 15

[libvirt] [PATCH] virsh: Don't break loop of domblkinfo for disks
by Han Han 22 Aug '18

22 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1619625 --all option is added to cmdDomblkinfo since commit 62c39193 allowing to show all block devices info. Remove its 'goto cleanup' part in case it breaks the loop of domblkinfo for all disks. Remove unnecessary variables and the condition part after virDomainGetBlockInfo returning fail. Signed-off-by: Han Han <hhan(a)redhat.com> --- tools/virsh-domain-monitor.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index b9b4f9739b..ee926baae8 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -476,7 +476,6 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) size_t i; xmlNodePtr *disks = NULL; char *target = NULL; - char *protocol = NULL; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -490,7 +489,6 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) human = vshCommandOptBool(cmd, "human"); if (all) { - bool active = virDomainIsActive(dom) == 1; int rc; if (virshDomainGetXML(ctl, cmd, 0, &xmldoc, &ctxt) < 0) @@ -505,29 +503,18 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < ndisks; i++) { ctxt->node = disks[i]; - protocol = virXPathString("string(./source/@protocol)", ctxt); target = virXPathString("string(./target/@dev)", ctxt); rc = virDomainGetBlockInfo(dom, target, &info, 0); if (rc < 0) { - /* If protocol is present that's an indication of a networked - * storage device which cannot provide statistics, so generate - * 0 based data and get the next disk. */ - if (protocol && !active && - virGetLastErrorCode() == VIR_ERR_INTERNAL_ERROR && - virGetLastErrorDomain() == VIR_FROM_STORAGE) { - memset(&info, 0, sizeof(info)); - vshResetLibvirtError(); - } else { - goto cleanup; - } + memset(&info, 0, sizeof(info)); + vshResetLibvirtError(); } cmdDomblkinfoPrint(ctl, &info, target, human, false); VIR_FREE(target); - VIR_FREE(protocol); } } else { if (virDomainGetBlockInfo(dom, device, &info, 0) < 0) @@ -541,7 +528,6 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) cleanup: virshDomainFree(dom); VIR_FREE(target); - VIR_FREE(protocol); VIR_FREE(disks); xmlXPathFreeContext(ctxt); xmlFreeDoc(xmldoc); -- 2.18.0

2 2

[libvirt] [PATCH] Remove deprecated -balloon option
by Thomas Huth 22 Aug '18

22 Aug '18

The "-balloon" option has been replaced by "-device virtio-balloon". It's been marked as deprecated since two releases, and nobody complained, so let's remove it now. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- docs/virtio-balloon-stats.txt | 6 +++--- qemu-deprecated.texi | 5 ----- qemu-options.hx | 10 ---------- vl.c | 36 ------------------------------------ 4 files changed, 3 insertions(+), 54 deletions(-) diff --git a/docs/virtio-balloon-stats.txt b/docs/virtio-balloon-stats.txt index 9985e1d..1732cc8 100644 --- a/docs/virtio-balloon-stats.txt +++ b/docs/virtio-balloon-stats.txt @@ -61,9 +61,9 @@ It's also important to note the following: respond to the request the timer will never be re-armed, which has the same effect as disabling polling -Here are a few examples. QEMU is started with '-balloon virtio', which -generates '/machine/peripheral-anon/device[1]' as the QOM path for the -balloon device. +Here are a few examples. QEMU is started with '-device virtio-balloon', +which generates '/machine/peripheral-anon/device[1]' as the QOM path for +the balloon device. Enable polling with 2 seconds interval: diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 67b7211..0714017 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -106,11 +106,6 @@ enabled via the ``-machine usb=on'' argument. The ``-nodefconfig`` argument is a synonym for ``-no-user-config``. -@subsection -balloon (since 2.12.0) - -The @option{--balloon virtio} argument has been superseded by -@option{--device virtio-balloon}. - @subsection -fsdev handle (since 2.12.0) The ``handle'' fsdev backend does not support symlinks and causes the 9p diff --git a/qemu-options.hx b/qemu-options.hx index 4efdedf..47c6b92 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -454,16 +454,6 @@ modprobe i810_audio clocking=48000 @end example ETEXI -DEF("balloon", HAS_ARG, QEMU_OPTION_balloon, - "-balloon virtio[,addr=str]\n" - " enable virtio balloon device (deprecated)\n", QEMU_ARCH_ALL) -STEXI -@item -balloon virtio[,addr=@var{addr}] -@findex -balloon -Enable virtio balloon device, optionally with PCI address @var{addr}. This -option is deprecated, use @option{-device virtio-balloon} instead. -ETEXI - DEF("device", HAS_ARG, QEMU_OPTION_device, "-device driver[,prop[=value][,...]]\n" " add device (based on driver)\n" diff --git a/vl.c b/vl.c index 16b913f..f952f01 100644 --- a/vl.c +++ b/vl.c @@ -2127,36 +2127,6 @@ static void parse_display(const char *p) } } -static int balloon_parse(const char *arg) -{ - QemuOpts *opts; - - warn_report("This option is deprecated. " - "Use '--device virtio-balloon' to enable the balloon device."); - - if (strcmp(arg, "none") == 0) { - return 0; - } - - if (!strncmp(arg, "virtio", 6)) { - if (arg[6] == ',') { - /* have params -> parse them */ - opts = qemu_opts_parse_noisily(qemu_find_opts("device"), arg + 7, - false); - if (!opts) - return -1; - } else { - /* create empty opts */ - opts = qemu_opts_create(qemu_find_opts("device"), NULL, 0, - &error_abort); - } - qemu_opt_set(opts, "driver", "virtio-balloon", &error_abort); - return 0; - } - - return -1; -} - char *qemu_find_file(int type, const char *name) { int i; @@ -3659,12 +3629,6 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_no_hpet: no_hpet = 1; break; - case QEMU_OPTION_balloon: - if (balloon_parse(optarg) < 0) { - error_report("unknown -balloon argument %s", optarg); - exit(1); - } - break; case QEMU_OPTION_no_reboot: no_reboot = 1; break; -- 1.8.3.1

6 5

[libvirt] [PATCH] doc: better explanation for virStoragePoolSetAutostart
by Dan Kenigsberg 22 Aug '18

22 Aug '18

The former documentation was an unhelpful tautology. The suggested doc mimicks^Wcopies the one of virDomainSetAutostart. Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- src/libvirt-storage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 1879c6bd60..ed305b9b5e 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -1127,7 +1127,8 @@ virStoragePoolGetAutostart(virStoragePoolPtr pool, * @pool: pointer to storage pool * @autostart: new flag setting * - * Sets the autostart flag + * Configure the storage pool to be automatically started + * when the host machine boots. * * Returns 0 on success, -1 on failure */ -- 2.17.1

2 1

[libvirt] [PATCH v2 0/2] Add .domainGetHostname() support for QEMU driver.
by Julio Faracco 22 Aug '18

22 Aug '18

This serie adds a new function into QEMU Guest Agent handlers to use the QEMU command 'guest-get-host-name' to retrieve the domain hostname. This approach requires QEMU-GA running inside the guest, but it is the fastest and easiest way to get this info. Julio Faracco (2): qemu: implementing qemuAgentGetHostname() function. qemu: adding domainGetHostname support for QEMU. src/qemu/qemu_agent.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 4 ++++ src/qemu/qemu_driver.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) -- 2.17.1

2 5

[libvirt] [PATCH] ppc: Remove deprecated ppcemb target
by Thomas Huth 22 Aug '18

22 Aug '18

There is no known available OS for ppc around anymore that uses page sizes below 4k, so it does not make much sense that we keep wasting our time on building and testing the ppcemb-softmmu target. It has been deprecated since two releases, and nobody complained, so let's remove this now. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- configure | 13 +++---------- cpus.c | 1 - default-configs/ppcemb-softmmu.mak | 23 ----------------------- hw/ppc/ppc405_boards.c | 14 -------------- hw/ppc/ppc440_bamboo.c | 7 ------- hw/ppc/sam460ex.c | 7 ------- hw/ppc/virtex_ml507.c | 7 ------- include/exec/poison.h | 1 - qapi/common.json | 2 +- qemu-deprecated.texi | 6 ------ target/ppc/cpu-qom.h | 2 -- target/ppc/cpu.h | 16 ---------------- target/ppc/kvm.c | 4 +--- target/ppc/mmu_helper.c | 6 +++--- target/ppc/translate_init.inc.c | 35 +---------------------------------- tests/machine-none-test.c | 1 - 16 files changed, 9 insertions(+), 136 deletions(-) delete mode 100644 default-configs/ppcemb-softmmu.mak diff --git a/configure b/configure index e7bddc0..0fc55eb 100755 --- a/configure +++ b/configure @@ -195,8 +195,7 @@ supported_kvm_target() { i386:i386 | i386:x86_64 | i386:x32 | \ x86_64:i386 | x86_64:x86_64 | x86_64:x32 | \ mips:mips | mipsel:mips | \ - ppc:ppc | ppcemb:ppc | ppc64:ppc | \ - ppc:ppc64 | ppcemb:ppc64 | ppc64:ppc64 | \ + ppc:ppc | ppc64:ppc | ppc:ppc64 | ppc64:ppc64 | \ s390x:s390x) return 0 ;; @@ -6935,7 +6934,7 @@ if test "$linux" = "yes" ; then i386|x86_64|x32) linux_arch=x86 ;; - ppcemb|ppc|ppc64) + ppc|ppc64) linux_arch=powerpc ;; s390x) @@ -6965,7 +6964,7 @@ target_name=$(echo $target | cut -d '-' -f 1) target_bigendian="no" case "$target_name" in - armeb|aarch64_be|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb) + armeb|aarch64_be|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb) target_bigendian=yes ;; esac @@ -7093,12 +7092,6 @@ case "$target_name" in gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" target_compiler=$cross_cc_powerpc ;; - ppcemb) - TARGET_BASE_ARCH=ppc - TARGET_ABI_DIR=ppc - gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" - target_compiler=$cross_cc_ppcemb - ;; ppc64) TARGET_BASE_ARCH=ppc TARGET_ABI_DIR=ppc diff --git a/cpus.c b/cpus.c index b5844b7..80ca683 100644 --- a/cpus.c +++ b/cpus.c @@ -2203,7 +2203,6 @@ static CpuInfoArch sysemu_target_to_cpuinfo_arch(SysEmuTarget target) return CPU_INFO_ARCH_X86; case SYS_EMU_TARGET_PPC: - case SYS_EMU_TARGET_PPCEMB: case SYS_EMU_TARGET_PPC64: return CPU_INFO_ARCH_PPC; diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak deleted file mode 100644 index ac44f15..0000000 --- a/default-configs/ppcemb-softmmu.mak +++ /dev/null @@ -1,23 +0,0 @@ -# Default configuration for ppcemb-softmmu - -include pci.mak -include sound.mak -include usb.mak -CONFIG_PPC4XX=y -CONFIG_M48T59=y -CONFIG_SERIAL=y -CONFIG_SERIAL_ISA=y -CONFIG_I8257=y -CONFIG_OPENPIC=y -CONFIG_PFLASH_CFI01=y -CONFIG_PFLASH_CFI02=y -CONFIG_PTIMER=y -CONFIG_I8259=y -CONFIG_XILINX=y -CONFIG_XILINX_ETHLITE=y -CONFIG_USB_EHCI_SYSBUS=y -CONFIG_SM501=y -CONFIG_DDC=y -CONFIG_IDE_SII3112=y -CONFIG_I2C=y -CONFIG_BITBANG_I2C=y diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index 7011107..3a54d52 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -202,13 +202,6 @@ static void ref405ep_init(MachineState *machine) DriveInfo *dinfo; MemoryRegion *sysmem = get_system_memory(); -#ifdef TARGET_PPCEMB - if (!qtest_enabled()) { - warn_report("qemu-system-ppcemb is deprecated, " - "please use qemu-system-ppc instead."); - } -#endif - /* XXX: fix this */ memory_region_allocate_system_memory(&ram_memories[0], NULL, "ef405ep.ram", 0x08000000); @@ -503,13 +496,6 @@ static void taihu_405ep_init(MachineState *machine) int fl_idx, fl_sectors; DriveInfo *dinfo; -#ifdef TARGET_PPCEMB - if (!qtest_enabled()) { - warn_report("qemu-system-ppcemb is deprecated, " - "please use qemu-system-ppc instead."); - } -#endif - /* RAM is soldered to the board so the size cannot be changed */ ram_size = 0x08000000; memory_region_allocate_system_memory(ram, NULL, "taihu_405ep.ram", diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 3d4c43b..f5720f9 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -195,13 +195,6 @@ static void bamboo_init(MachineState *machine) exit(1); } -#ifdef TARGET_PPCEMB - if (!qtest_enabled()) { - warn_report("qemu-system-ppcemb is deprecated, " - "please use qemu-system-ppc instead."); - } -#endif - qemu_register_reset(main_cpu_reset, cpu); ppc_booke_timers_init(cpu, 400000000, 0); ppc_dcr_init(env, NULL, NULL); diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 9c77183..250fb86 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -419,13 +419,6 @@ static void sam460ex_init(MachineState *machine) exit(1); } -#ifdef TARGET_PPCEMB - if (!qtest_enabled()) { - warn_report("qemu-system-ppcemb is deprecated, " - "please use qemu-system-ppc instead."); - } -#endif - qemu_register_reset(main_cpu_reset, cpu); boot_info = g_malloc0(sizeof(*boot_info)); env->load_info = boot_info; diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 7891464..ee9b4b4 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -211,13 +211,6 @@ static void virtex_init(MachineState *machine) int kernel_size; int i; -#ifdef TARGET_PPCEMB - if (!qtest_enabled()) { - warn_report("qemu-system-ppcemb is deprecated, " - "please use qemu-system-ppc instead."); - } -#endif - /* init CPUs */ cpu = ppc440_init_xilinx(&ram_size, 1, machine->cpu_type, 400000000); env = &cpu->env; diff --git a/include/exec/poison.h b/include/exec/poison.h index 41cd2eb..97d3b56 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -24,7 +24,6 @@ #pragma GCC poison TARGET_NIOS2 #pragma GCC poison TARGET_OPENRISC #pragma GCC poison TARGET_PPC -#pragma GCC poison TARGET_PPCEMB #pragma GCC poison TARGET_PPC64 #pragma GCC poison TARGET_ABI32 #pragma GCC poison TARGET_S390X diff --git a/qapi/common.json b/qapi/common.json index c367adc..50ac121 100644 --- a/qapi/common.json +++ b/qapi/common.json @@ -146,6 +146,6 @@ 'data' : [ 'aarch64', 'alpha', 'arm', 'cris', 'hppa', 'i386', 'lm32', 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64', 'mips64el', 'mipsel', 'moxie', 'nios2', 'or1k', 'ppc', - 'ppc64', 'ppcemb', 'riscv32', 'riscv64', 's390x', 'sh4', + 'ppc64', 'riscv32', 'riscv64', 's390x', 'sh4', 'sh4eb', 'sparc', 'sparc64', 'tricore', 'unicore32', 'x86_64', 'xtensa', 'xtensaeb' ] } diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 67b7211..8cd2a3d 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -182,12 +182,6 @@ replaced by the ``target'' output member. The ``ivshmem'' device type is replaced by either the ``ivshmem-plain'' or ``ivshmem-doorbell`` device types. -@subsection Page size support < 4k for embedded PowerPC CPUs (since 2.12.0) - -qemu-system-ppcemb will be removed. qemu-system-ppc (or qemu-system-ppc64) -should be used instead. That means that embedded 4xx PowerPC CPUs will not -support page sizes < 4096 any longer. - @section System emulator machines @subsection pc-0.10 and pc-0.11 (since 3.0) diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 433a71e..4ea6769 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -24,8 +24,6 @@ #ifdef TARGET_PPC64 #define TYPE_POWERPC_CPU "powerpc64-cpu" -#elif defined(TARGET_PPCEMB) -#define TYPE_POWERPC_CPU "embedded-powerpc-cpu" #else #define TYPE_POWERPC_CPU "powerpc-cpu" #endif diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 4edcf62..758227d 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -52,23 +52,7 @@ #else /* defined (TARGET_PPC64) */ /* PowerPC 32 definitions */ #define TARGET_LONG_BITS 32 - -#if defined(TARGET_PPCEMB) -/* Specific definitions for PowerPC embedded */ -/* BookE have 36 bits physical address space */ -#if defined(CONFIG_USER_ONLY) -/* It looks like a lot of Linux programs assume page size - * is 4kB long. This is evil, but we have to deal with it... - */ -#define TARGET_PAGE_BITS 12 -#else /* defined(CONFIG_USER_ONLY) */ -/* Pages can be 1 kB small */ -#define TARGET_PAGE_BITS 10 -#endif /* defined(CONFIG_USER_ONLY) */ -#else /* defined(TARGET_PPCEMB) */ -/* "standard" PowerPC 32 definitions */ #define TARGET_PAGE_BITS 12 -#endif /* defined(TARGET_PPCEMB) */ #define TARGET_PHYS_ADDR_SPACE_BITS 36 #define TARGET_VIRT_ADDR_SPACE_BITS 32 diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 9211ee2..ef63842 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -1315,9 +1315,7 @@ int kvmppc_set_interrupt(PowerPCCPU *cpu, int irq, int level) return 0; } -#if defined(TARGET_PPCEMB) -#define PPC_INPUT_INT PPC40x_INPUT_INT -#elif defined(TARGET_PPC64) +#if defined(TARGET_PPC64) #define PPC_INPUT_INT PPC970_INPUT_INT #else #define PPC_INPUT_INT PPC6xx_INPUT_INT diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index e6739e6..a1d848f 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -2363,12 +2363,12 @@ void helper_4xx_tlbwe_hi(CPUPPCState *env, target_ulong entry, tlb->size = booke_tlb_to_page_size((val >> PPC4XX_TLBHI_SIZE_SHIFT) & PPC4XX_TLBHI_SIZE_MASK); /* We cannot handle TLB size < TARGET_PAGE_SIZE. - * If this ever occurs, one should use the ppcemb target instead - * of the ppc or ppc64 one + * If this ever occurs, we should implement TARGET_PAGE_BITS_VARY */ if ((val & PPC4XX_TLBHI_V) && tlb->size < TARGET_PAGE_SIZE) { cpu_abort(cs, "TLB size " TARGET_FMT_lu " < %u " - "are not supported (%d)\n", + "are not supported (%d)\n" + "Please implement TARGET_PAGE_BITS_VARY\n", tlb->size, TARGET_PAGE_SIZE, (int)((val >> 7) & 0x7)); } tlb->EPN = val & ~(tlb->size - 1); diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index 7813b1b..c16d986 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -9630,17 +9630,6 @@ static int ppc_fixup_cpu(PowerPCCPU *cpu) return 0; } -static inline bool ppc_cpu_is_valid(PowerPCCPUClass *pcc) -{ -#ifdef TARGET_PPCEMB - return pcc->mmu_model == POWERPC_MMU_BOOKE || - pcc->mmu_model == POWERPC_MMU_SOFT_4xx || - pcc->mmu_model == POWERPC_MMU_SOFT_4xx_Z; -#else - return true; -#endif -} - static void ppc_cpu_realize(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); @@ -9664,8 +9653,6 @@ static void ppc_cpu_realize(DeviceState *dev, Error **errp) } } - assert(ppc_cpu_is_valid(pcc)); - create_ppc_opcodes(cpu, &local_err); if (local_err != NULL) { error_propagate(errp, local_err); @@ -9916,10 +9903,6 @@ static gint ppc_cpu_compare_class_pvr(gconstpointer a, gconstpointer b) return -1; } - if (!ppc_cpu_is_valid(pcc)) { - return -1; - } - return pcc->pvr == pvr ? 0 : -1; } @@ -9950,10 +9933,6 @@ static gint ppc_cpu_compare_class_pvr_mask(gconstpointer a, gconstpointer b) return -1; } - if (!ppc_cpu_is_valid(pcc)) { - return -1; - } - if (pcc->pvr_match(pcc, pvr)) { return 0; } @@ -10019,11 +9998,7 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name) g_free(typename); g_free(cpu_model); - if (oc && ppc_cpu_is_valid(POWERPC_CPU_CLASS(oc))) { - return oc; - } - - return NULL; + return oc; } static void ppc_cpu_parse_featurestr(const char *type, char *features, @@ -10129,9 +10104,6 @@ static void ppc_cpu_list_entry(gpointer data, gpointer user_data) char *name; int i; - if (!ppc_cpu_is_valid(pcc)) { - return; - } if (unlikely(strcmp(typename, TYPE_HOST_POWERPC_CPU) == 0)) { return; } @@ -10189,11 +10161,6 @@ static void ppc_cpu_defs_entry(gpointer data, gpointer user_data) const char *typename; CpuDefinitionInfoList *entry; CpuDefinitionInfo *info; - PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc); - - if (!ppc_cpu_is_valid(pcc)) { - return; - } typename = object_class_get_name(oc); info = g_malloc0(sizeof(*info)); diff --git a/tests/machine-none-test.c b/tests/machine-none-test.c index 7e72466..2b3b750 100644 --- a/tests/machine-none-test.c +++ b/tests/machine-none-test.c @@ -44,7 +44,6 @@ static struct arch2cpu cpus_map[] = { { "or1k", "or1200" }, { "ppc", "604" }, { "ppc64", "power8e_v2.1" }, - { "ppcemb", "440epb" }, { "s390x", "qemu" }, { "sh4", "sh7750r" }, { "sh4eb", "sh7751r" }, -- 1.8.3.1

2 1

[libvirt] [PATCH v4 0/2] Fix detection of slow guest shutdown
by Christian Ehrhardt 21 Aug '18

21 Aug '18

Hi, after a good discussion a few days ago in https://www.redhat.com/archives/libvir-list/2018-August/msg00122.html and a short lived but back then untested v2 in https://www.redhat.com/archives/libvir-list/2018-August/msg00199.html I finally get access to the right HW again and completed the series. Being finally retested and working I finally feel safe to submit without a RFC prefix. I think this would be a great addition for a better handling of guests with plenty of host devices passed through. With the new code in place I can shutdown systems that have 12, 16 or even more hostdevs attached without getting into the "zombie" mode where libvirt will forever consider the guest as "in shutdown" as it gave up waiting too early because the signal zero still was able to reach it. Scaling examples (extracted with gdb): 16 Devices: virProcessKillPainfullyDelay (pid=67096, force=true, extradelay=32) 12 Devices: virProcessKillPainfullyDelay (pid=68251, force=true, extradelay=24) *Updates in v4* - virDebug now reports the extradelay as requested (in seconds) and thereby mostly matches the gdb output seen above - header function prototype defines the variable name - clarify the usage of delay units - seconds (API call) - 5th of seconds (internal poll loop) - explain the request for 2*nhostdevs from the qemu shutdown code *Updates in v3* - fixup some issues found in testing and code checks *Updates in v2* - removed the "accept the lack of /proc/<pid> as valid process removal" approach due to valid concerns about reusing ressources. - added a dynamic extra wait scaling with the amount of hostdevs Christian Ehrhardt (2): process: wait longer on kill per assigned Hostdev process: wait longer 5->30s on hard shutdown src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 7 +++++-- src/util/virprocess.c | 22 ++++++++++++++++++---- src/util/virprocess.h | 3 +++ 4 files changed, 27 insertions(+), 6 deletions(-) -- 2.17.1

2 4

[libvirt] [jenkins-ci PATCH] projects: Fix comments for libvirt-dbus
by Andrea Bolognani 21 Aug '18

21 Aug '18

The comments were accurate but misplaced. Fix that. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as somewhat embarrassing and utterly trivial. projects/libvirt-dbus.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/libvirt-dbus.yaml b/projects/libvirt-dbus.yaml index 0fde390..74163b7 100644 --- a/projects/libvirt-dbus.yaml +++ b/projects/libvirt-dbus.yaml @@ -18,7 +18,7 @@ parent_jobs: 'libvirt-glib-master-build' - autotools-syntax-check-job: parent_jobs: 'libvirt-dbus-master-build' - # The test suite uses Python 3, which CentOS 7 doesn't include + # syntax-check uses Python 3, which CentOS 7 doesn't include machines: - libvirt-debian-9 - libvirt-fedora-27 @@ -28,7 +28,7 @@ - libvirt-freebsd-11 - autotools-check-job: parent_jobs: 'libvirt-dbus-master-syntax-check' - # syntax-check uses Python 3, which CentOS 7 doesn't include + # The test suite uses Python 3, which CentOS 7 doesn't include machines: - libvirt-debian-9 - libvirt-fedora-27 -- 2.17.1

1 0

[libvirt] [jenkins-ci PATCH v2 0/2] projects: Document rationale for skipping jobs
by Andrea Bolognani 21 Aug '18

21 Aug '18

Changes from [v1]: * refresh after recent changes to the jobs. [v1] https://www.redhat.com/archives/libvir-list/2018-August/msg00580.html Andrea Bolognani (2): projects: Add default machines for libvirt-dbus projects: Document rationale for skipping jobs projects/libvirt-dbus.yaml | 19 +++++++++++-------- projects/libvirt-sandbox.yaml | 3 +++ projects/libvirt-tck.yaml | 2 ++ projects/libvirt.yaml | 2 ++ projects/virt-manager.yaml | 1 + projects/virt-viewer.yaml | 2 ++ 6 files changed, 21 insertions(+), 8 deletions(-) -- 2.17.1

2 6

[libvirt] [PATCH v3 0/2] Fix detection of slow guest shutdown
by Christian Ehrhardt 21 Aug '18

21 Aug '18

Hi, after a good discussion a few days ago in https://www.redhat.com/archives/libvir-list/2018-August/msg00122.html and a short lived but back then untested v2 in https://www.redhat.com/archives/libvir-list/2018-August/msg00199.html I finally get access to the right HW again and completed the series. Being finally retested and working I finally feel safe to submit without a RFC prefix. I think this would be a great addition for a better handling of guests with plenty of host devices passed through. With the new code in place I can shutdown systems that have 12, 16 or even more hostdevs attached without getting into the "zombie" mode where libvirt will forever consider the guest as "in shutdown" as it gave up waiting too early because the signal zero still was able to reach it. Scaling examples (extracted with gdb): 16 Devices: virProcessKillPainfullyDelay (pid=67096, force=true, extradelay=32) 12 Devices: virProcessKillPainfullyDelay (pid=68251, force=true, extradelay=24) *Updates in v3* - fixup some issues found in testing and code checks *Updates in v2* - removed the "accept the lack of /proc/<pid> as valid process removal" approach due to valid concerns about reusing ressources. - added a dynamic extra wait scaling with the amount of hostdevs Christian Ehrhardt (2): process: wait longer on kill per assigned Hostdev process: wait longer 5->30s on hard shutdown src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 5 +++-- src/util/virprocess.c | 20 ++++++++++++++++---- src/util/virprocess.h | 1 + 4 files changed, 21 insertions(+), 6 deletions(-) -- 2.17.1

3 10

[libvirt] [PATCH] conf: Parse guestfwd channel device info again
by Michal Privoznik 21 Aug '18

21 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1610072 Due to historical reasons we were not parsing device info on guestfwd channel. Sure, it doesn't make much sense to parse <address/> but it surely makes sense to parse its alias (which might be an user alias). This reverts commit 47a3dd46ead20e6fdc30bcdc1b8e707e250d33da which fixed https://bugzilla.redhat.com/show_bug.cgi?id=1172526. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3c254801cd..123abec1ba 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12807,14 +12807,8 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xmlopt, } } - if (def->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && - def->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD) { - VIR_DEBUG("Ignoring device address for gustfwd channel"); - } else if (virDomainDeviceInfoParseXML(xmlopt, node, - &def->info, flags) < 0) { + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; - } - if (def->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && def->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB && -- 2.16.4

2 3

[libvirt] [PATCH v2 0/2] Parse guestfwd channel device info again
by Michal Privoznik 21 Aug '18

21 Aug '18

v2 of: https://www.redhat.com/archives/libvir-list/2018-August/msg01208.html diff to v1: - did what Andrea suggested Michal Prívozník (2): device_conf: Split virDomainDeviceInfoClear conf: Parse guestfwd channel device info again src/conf/device_conf.c | 10 ++++++++-- src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 13 ++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) -- 2.16.4

2 6

[libvirt] [PULL 00/12] Ui 20180821 patches
by Gerd Hoffmann 21 Aug '18

21 Aug '18

The following changes since commit d0092d90eb546a8bbe9e9120426c189474123797: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180820' into staging (2018-08-20 17:41:18 +0100) are available in the git repository at: git://git.kraxel.org/qemu tags/ui-20180821-pull-request for you to fetch changes up to 8a674d96a572c7ec1219a24ef223160dc6a27ca8: util: promote qemu_egl_rendernode_open() to libqemuutil (2018-08-21 08:24:30 +0200) ---------------------------------------------------------------- ui: misc ui fixed which piled up during 3.0 release freeze. ---------------------------------------------------------------- Daniel P. Berrangé (2): doc: switch to modern syntax for VNC TLS setup vnc: remove support for deprecated tls, x509, x509verify options Marc-André Lureau (3): ui: use enum to string helpers dmabuf: add y0_top, pass it to spice util: promote qemu_egl_rendernode_open() to libqemuutil Paolo Bonzini (2): spice-display: access ptr_x/ptr_y under Mutex spice-display: fix qemu_spice_cursor_refresh_bh locking Peter Wu (1): vnc: fix memleak of the "vnc-worker-output" name Philippe Mathieu-Daudé (1): ui/vnc: Remove useless parenthesis around DIV_ROUND_UP macro Tao Wu via Qemu-devel (1): sdl2: redraw correctly when scanout_mode enabled. Thomas Huth (2): ui/sdl2: Remove the obsolete SDL_INIT_NOPARACHUTE flag ui/sdl2: Fix broken -full-screen CLI option include/qemu/drm.h | 6 ++++ include/ui/console.h | 1 + qemu-keymap.c | 2 +- ui/console.c | 6 ++-- ui/egl-helpers.c | 51 ++-------------------------- ui/sdl2-gl.c | 5 +++ ui/sdl2.c | 13 +++----- ui/spice-display.c | 40 ++++++++++++++-------- ui/vnc-enc-tight.c | 2 +- ui/vnc-jobs.c | 3 +- ui/vnc.c | 94 ++-------------------------------------------------- util/drm.c | 66 ++++++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + qemu-deprecated.texi | 20 ----------- qemu-doc.texi | 20 ++++++++--- qemu-options.hx | 43 ------------------------ util/Makefile.objs | 1 + 17 files changed, 138 insertions(+), 236 deletions(-) create mode 100644 include/qemu/drm.h create mode 100644 util/drm.c -- 2.9.3

2 14

[libvirt] [PATCH] util: Don't delete the original file for truncation
by Marc Hartmayer 21 Aug '18

21 Aug '18

Truncate means that if a file exists it's length will be truncated to 0, but the mode and the owner shall be unchanged. The current behavior is that the original file is deleted and a new file is created. Let's fix this by using O_TRUNC. The function virRotatingFileWriterDelete is now unused but may be used in the future and is therefore still defined. Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- Note: This change has the (potentially unwanted) security effect that the owner/group of the log file does not change. Before this patch the old log file was deleted and the newly created log file was owned by the virtlogd user. Now, if a user has created the log file before, he can read the logs. If we don't wanna have this effect we can either adjust/add a virtlogd API or do a chown within the calling driver (e.g. QEMU driver). Side note: the original behavior has changed with the patch series "qemu: use FD passing for chardev UNIX sockets". Example where it the behavior has changed: <console type='file'> <source path='/tmp/console.log'/> <target type='serial'/> </console> --- src/util/virrotatingfile.c | 49 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index ca62a8e02641..d6ab3780aae3 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -98,17 +98,25 @@ virRotatingFileReaderEntryFree(virRotatingFileReaderEntryPtr entry) static virRotatingFileWriterEntryPtr virRotatingFileWriterEntryNew(const char *path, - mode_t mode) + mode_t mode, + bool truncate) { virRotatingFileWriterEntryPtr entry; struct stat sb; + /* O_APPEND is also useful in combination with O_TRUNC since it + * guarantees the atomicity of a write operation (at least for + * POSIX systems) */ + int oflag = O_CREAT|O_APPEND|O_WRONLY|O_CLOEXEC; VIR_DEBUG("Opening %s mode=0%02o", path, mode); if (VIR_ALLOC(entry) < 0) return NULL; - if ((entry->fd = open(path, O_CREAT|O_APPEND|O_WRONLY|O_CLOEXEC, mode)) < 0) { + if (truncate) + oflag |= O_TRUNC; + + if ((entry->fd = open(path, oflag, mode)) < 0) { virReportSystemError(errno, _("Unable to open file: %s"), path); goto error; @@ -182,18 +190,10 @@ virRotatingFileReaderEntryNew(const char *path) static int -virRotatingFileWriterDelete(virRotatingFileWriterPtr file) +virRotatingFileWriterDeleteBackup(virRotatingFileWriterPtr file) { size_t i; - if (unlink(file->basepath) < 0 && - errno != ENOENT) { - virReportSystemError(errno, - _("Unable to delete file %s"), - file->basepath); - return -1; - } - for (i = 0; i < file->maxbackup; i++) { char *oldpath; if (virAsprintf(&oldpath, "%s.%zu", file->basepath, i) < 0) @@ -214,6 +214,24 @@ virRotatingFileWriterDelete(virRotatingFileWriterPtr file) } +static int ATTRIBUTE_UNUSED +virRotatingFileWriterDelete(virRotatingFileWriterPtr file) +{ + if (unlink(file->basepath) < 0 && + errno != ENOENT) { + virReportSystemError(errno, + _("Unable to delete file %s"), + file->basepath); + return -1; + } + + if (virRotatingFileWriterDeleteBackup(file) < 0) + return -1; + + return 0; +} + + /** * virRotatingFileWriterNew * @path: the base path for files @@ -257,12 +275,12 @@ virRotatingFileWriterNew(const char *path, file->maxbackup = maxbackup; file->maxlen = maxlen; - if (trunc && - virRotatingFileWriterDelete(file) < 0) + if (trunc && virRotatingFileWriterDeleteBackup(file) < 0) goto error; if (!(file->entry = virRotatingFileWriterEntryNew(file->basepath, - mode))) + mode, + trunc))) goto error; return file; @@ -491,7 +509,8 @@ virRotatingFileWriterAppend(virRotatingFileWriterPtr file, return -1; if (!(tmp = virRotatingFileWriterEntryNew(file->basepath, - file->mode))) + file->mode, + false))) return -1; virRotatingFileWriterEntryFree(file->entry); -- 2.13.4

2 3

[libvirt] [PATCH 0/2] vnc: remove deprecated TLS related features
by Daniel P. Berrangé 21 Aug '18

21 Aug '18

Daniel P. Berrangé (2): doc: switch to modern syntax for VNC TLS setup vnc: remove support for deprecated tls, x509, x509verify options qemu-deprecated.texi | 20 ---------- qemu-doc.texi | 20 +++++++--- qemu-options.hx | 43 --------------------- ui/vnc.c | 91 -------------------------------------------- 4 files changed, 15 insertions(+), 159 deletions(-) -- 2.17.1

2 3

[libvirt] [RFC v3] x86 RDT Cache Monitoring Technology (CMT)
by Huaqiang,Wang 21 Aug '18

21 Aug '18

For the supporting of Intel x86 Cache Monitoring Technology (CMT) in libvirt, we have already discussed a couple of times, and I have raised two RFCs, you can find the discussion from the following links, and thanks to the people who participated in the discussion online and offline. RFCv2 links https://www.redhat.com/archives/libvir-list/2018-July/msg00409.html https://www.redhat.com/archives/libvir-list/2018-July/msg01241.html RFCv1 https://www.redhat.com/archives/libvir-list/2018-June/msg00674.html Nearly one month has passed since last online discussion, in this month, MBA (memory bandwidth allocation) feature has been introduced by Niu Bin, and some fundamental code for CMT feature has been changed. This change is not that significant, and I wrote my POC code for this RFC again upon the new virresctrl framework, I also made some changes for the CMT feature. I think it is better to summarize my thought about the enabling of CMT here before I submit my code. I'll try to keep consistent with the previous discussion. 1. What is the purpose of this RFC and later patches? Short answer: Introducing Kernel resctrlfs based x86 CMT feature to libvirt. Detail explanation: Latest kernel has removed the "cmt, mbmt, mbml" perf event, and libvirt relies on these kernel perf events to report the result of CMT/MBM through virperf interface. Libvirt will no longer support CMT/MBM feature for Linux distribution with the latest kernel, while there CPU features are vital to some software such as Openstack Nova. About the deprecation of cmt/mbm perf events, refer to the following link for details: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git /commit/?id=c39a0e2c8850f08249383f2425dbd8dbe4baad69 Latest kernel introduces the RDT feature, including CAT MBA CDP CMT and MBM, through resource control file system (resctrl fs), and libvirt already implemented the cache and memory bandwidth allocation through kernel resctrlfs interface. I'd like to add the cache and memory bandwidth monitoring feature to libvirt through kernel resctrlfs interface. Since CMT and MBM shares a very similar kernel interface, for simplicity, only discuss CMT here. MBM is the followup that will be implemented after CMT, which should be very straightforward once CMT is ready. It is planned to output the cache monitoring result through 'domstats' command, and create or delete monitoring groups with either domain's statical XML configuration file or a new 'virsh' runtime command. 2. How many stages scheduled to implement the libvirt CMT(MBM) feature? Short answer: 4 stages. Detail explanation: stage 1: Statical CMT feature. Implementing the libvirt interface for creating and deleting CMT groups for statically through domain's XML configuration file, changes only takes effect after a reboot. Stage 2: Statical MBM feature. Very similar to stage1 CMT. Stage 3: Dynamical CMT feature. In this stage, it is aimed to implement interfaces to change the CMT groups dynamically at runtime, with no requirement for a reboot. My basic thought is implementing a new 'virsh' sub-command providing all interfaces. I also hope to implement the functionality of dynamical cache allocation (CAT) with this command. Stage 4: Dynamical MBM feature. Depending on the implementation of stage3, should share many interfaces created at stage 3. This RFC mainly covers the discussion of stage1. 3. What is the interface for statical CMT feature (the output and input)? Short answer: output through command 'domstats'; input through XML file. Detail explanation: Output: Either CMT or MBM is Intel x86 CPU feature, so I put the statistical message under the result of 'cpu-total' subcommand. This is different with RFCv2, in RFCv2 a separate 'domstats' sub-command has been created, with the name 'cpu-resource', Martin and I were not very satisfied with the the naming. The output would be: virsh domstats --cpu--total Domain: 'ubuntu16.04-base' cpu.time=3143918715755 cpu.user=15320000000 cpu.system=235280000000 cpu.cache.monitor.count=3 cpu.cache.0.name=vcpus_2 cpu.cache.0.vcpus=2 cpu.cache.0.bank.count=2 cpu.cache.0.bank.0.bytes=5488 cpu.cache.0.bank.1.bytes =4410000 cpu.cache.1.name=vcpus_1 cpu.cache.1.vcpus=1 cpu.cache.1.bank.count=2 cpu.cache.1.bank.0.bytes =7839744 cpu.cache.1.bank.1.bytes =0 cpu.cache.2.name=vcpu_0,3 cpu.cache.2.vcpus=0,3 cpu.cache.2.bank.count=2 cpu.cache.2.bank.0.bytes=53796864 cpu.cache.2.bank.1.bytes=0 Comparing with RFCv2, the CMT information is slightly changed. Input: Comparing with RFC v2, this part has been changed. Now the resource monitoring group is considered as a resource monitor toward specific allocation. The main interface for creating monitoring group is through XML file. The proposed configuration is like: <cputune> <cachetune vcpus='0-1'> <cache id='0' level='3' type='code' size='7680' unit='KiB'/> <cache id='1' level='3' type='data' size='3840' unit='KiB'/> + <monitor vcpus='0-1'/> + <monitor vcpus='0'/> </cachetune> <cachetune vcpus='3'> + <monitor vcpus='3'/> </cachetune> </cputune> In above XML, created 2 cache resctrl allocation groups and 3 resctrl monitoring groups. For cache allocation group with vcpu 0 and vcpu 1, there are two monitors: one is monitoring the last level cache occupancy of two vcpus, while the other one only monitors the cache occupancy of vcpu 0. In another cache allocation, there is no explicit cache resource allocation, this cache allocation uses the resource of 'default' cache allocation group, and a cache monitor is created to monitor the cache occupancy. 4. Have emulator and io threads been considered for CMT? Short answer: No. Unsupport to allocate dedicated cache or memory bandwidth for emulator and io threads.

1 0

[libvirt] [jenkins-ci PATCH 0/5] Drop last use of ~/rpmbuild, other cleanups
by Andrea Bolognani 20 Aug '18

20 Aug '18

Patch 1/5 ensures ~/rpmbuild is no longer used, while the remaining ones increase consistency in the various rules used to build RPMs. Andrea Bolognani (5): jobs: Call rpmbuild explicitly for Python projects jobs: Call rpmbuild and sed consistently jobs: Introduce strip_buildrequires jobs: Minimize strip_buildrequires jobs: Don't remove non-existing archives jobs/autotools.yaml | 7 ++----- jobs/defaults.yaml | 5 +++++ jobs/perl-modulebuild.yaml | 5 +---- jobs/python-distutils.yaml | 5 +++-- projects/osinfo-db.yaml | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) -- 2.17.1

2 14

[libvirt] [PATCH] spec: Add support for RISC-V (riscv64)
by Richard W.M. Jones 20 Aug '18

20 Aug '18

From: David Abdurachmanov <david.abdurachmanov(a)gmail.com> --- libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e7196b7d3b..5cb995a6a4 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -101,7 +101,7 @@ %endif # Numactl is not available on s390[x] and ARM -%ifarch s390 s390x %{arm} +%ifarch s390 s390x %{arm} riscv64 %define with_numactl 0 %endif @@ -120,7 +120,7 @@ %endif # zfs-fuse is not available on some architectures -%ifarch s390 s390x aarch64 +%ifarch s390 s390x aarch64 riscv64 %define with_storage_zfs 0 %endif @@ -195,7 +195,7 @@ %if %{with_qemu} || %{with_lxc} || %{with_uml} # numad is used to manage the CPU and memory placement dynamically, # it's not available on s390[x] and ARM. - %ifnarch s390 s390x %{arm} + %ifnarch s390 s390x %{arm} riscv64 %define with_numad 0%{!?_without_numad:1} %endif %endif -- 2.18.0

2 1

[libvirt] [sandbox PATCH 0/2] Remove all uses of g_type_class_add_private()
by Andrea Bolognani 20 Aug '18

20 Aug '18

This fixes build on Fedora Rawhide. Andrea Bolognani (2): configure: Use a single required version for GLib Remove all uses of g_type_class_add_private() configure.ac | 7 +++---- libvirt-sandbox/libvirt-sandbox-builder-container.c | 4 +--- libvirt-sandbox/libvirt-sandbox-builder-initrd.c | 4 +--- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 4 +--- libvirt-sandbox/libvirt-sandbox-builder.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-disk.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-initrd.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-interactive.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-mount-file.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c | 5 ++--- libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.c | 5 ++--- libvirt-sandbox/libvirt-sandbox-config-mount-host-image.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-mount-ram.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-mount.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-network-address.c | 4 +--- .../libvirt-sandbox-config-network-filterref-parameter.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-network-filterref.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-network-route.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-network.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-service-generic.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-service-systemd.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-service.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config.c | 4 +--- libvirt-sandbox/libvirt-sandbox-console-raw.c | 4 +--- libvirt-sandbox/libvirt-sandbox-console-rpc.c | 4 +--- libvirt-sandbox/libvirt-sandbox-console.c | 4 +--- libvirt-sandbox/libvirt-sandbox-context-interactive.c | 4 +--- libvirt-sandbox/libvirt-sandbox-context-service.c | 4 +--- libvirt-sandbox/libvirt-sandbox-context.c | 4 +--- 29 files changed, 33 insertions(+), 88 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH 0/2] Add .domainGetHostname() support for QEMU driver.
by Julio Faracco 20 Aug '18

20 Aug '18

This serie adds a new function into QEMU Guest Agent handlers to use the QEMU command 'guest-get-host-name' to retrieve the domain hostname. This approach requires QEMU-GA running inside the guest, but it is the fastest and easiest way to get this info. Julio Faracco (2): qemu: implementing qemuAgentGetHostname() function. qemu: adding domainGetHostname support for QEMU. src/qemu/qemu_agent.c | 39 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 4 ++++ src/qemu/qemu_driver.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) -- 2.17.1

3 5

[libvirt] FYI: libvirt package on Fedora RISC-V
by Richard W.M. Jones 20 Aug '18

20 Aug '18

http://fedora-riscv.tranquillity.se/koji/taskinfo?taskID=95457 There were some minor changes to the spec file: https://src.fedoraproject.org/rpms/libvirt/c/18f7b8c79c2876b2d3a6ebe2279fd6… Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW

2 3

[libvirt] [PATCH v2 0/4] Fix a SIGSEGV in libvirtd when querying AMD SEV info
by Erik Skultety 20 Aug '18

20 Aug '18

This series fixes the following BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1612009 TL;DR: We don't format SEV platform data (PDH, certificate chain,...) into our qemu caps cache which poses a problem after libvirtd restart when we restore from the cache and get a segfault upon issuing virNodeGetSEVInfo. Since v1: - reworked patch 3 so that qemuMonitorJSONGetSEVCapabilities returns more values in order to distinguish between error and whether SEV is actually supported - added the missing backtrace to patch 4 - no other patches were changed apart from patch 3 Erik Skultety (4): tests: sev: Test launch-security with specific QEMU version qemu: Define and use a auto cleanup function with virSEVCapability qemu: Fix probing of AMD SEV support qemu: caps: Format SEV platform data into qemuCaps cache src/conf/domain_capabilities.h | 4 + src/qemu/qemu_capabilities.c | 127 +++++++++++++++++++-- src/qemu/qemu_monitor_json.c | 31 +++-- tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 5 +- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 6 + tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - ...args => launch-security-sev.x86_64-2.12.0.args} | 19 +-- tests/qemuxml2argvtest.c | 4 +- 8 files changed, 164 insertions(+), 33 deletions(-) rename tests/qemuxml2argvdata/{launch-security-sev.args => launch-security-sev.x86_64-2.12.0.args} (54%) -- 2.14.4

2 6

[libvirt] X86CPU "feature-words" property on QEMU (was Re: [PATCH v3 1/3] x86: Data structure changes to support MSR based) features
by Eduardo Habkost 17 Aug '18

17 Aug '18

On Fri, Aug 17, 2018 at 07:34:13PM +0200, Paolo Bonzini wrote: > On 17/08/2018 17:55, Eduardo Habkost wrote: > >> The names will be X86_CPU_FEATURE_WORD_TYPE_CPUID and > >> X86_CPU_FEATURE_WORD_TYPE_MSR. > > I wouldn't like to make this an external API unless really > > necessary. I would rather deprecate the "feature-words" property > > because nobody ended up using it. > > I think we should either remove it directly, or extend it to support MSR > features. Deprecating and only supporting CPUID features is the worst > of both worlds... So let's do what's necessary to remove it. But I don't think the removal of "feature-words" should block the inclusion of this series. Now, should QOM properties follow our feature deprecation policy, or they were never a supported external API and we can remove it immediately? CCing Jiri and libvir-list, because I just found that there's code on libvirt that uses it, but I don't know exactly it does with that info. -- Eduardo

2 2

[libvirt] [PATCHv2 00/11] BaselineHypervisorCPU using QEMU QMP exchanges
by Chris Venteicher 17 Aug '18

17 Aug '18

Some architectures (S390) depend on QEMU to compute baseline CPU model and expand a models feature set. Interacting with QEMU requires starting the QEMU process and completing one or more query-cpu-model-baseline QMP exchanges with QEMU in addition to a query-cpu-model-expansion QMP exchange to expand all features in the model. See "s390x CPU models: exposing features" patch set on Qemu-devel for discussion of QEMU aspects. This is part of resolution of: https://bugzilla.redhat.com/show_bug.cgi?id=1511999 Version 2 address all issues raised by Collin as well as all other issues identified with additional testing. Chris Venteicher (11): qemu_monitor_json: Introduce qemuMonitorCPUModelInfo / JSON conversion qemu_monitor: Introduce qemuMonitorGetCPUModelBaseline (query-cpu-model-baseline) qemu_monitor: Indicate when CPUModelInfo props report migratablity qemu_monitor: Introduce qemuMonitorCPUModelInfoInit and qemuMonitorCPUModelInfoFreeContents qemu_monitor: CPUModelExpansion on both model name and properties qemu_monitor: Introduce qemuMonitorCPUModelInfoRemovePropByBoolValue qemu_capabilities: Introduce virCPUDef / qemuMonitorCPUModelInfo conversions qemu_capabilities: QMPCommandPtr without maintaining shadow qmperr qemu_capabilities: Persist QEMU instance over multiple QMP Cmds qemu_capabilities: Introduce virQEMUCapsQMPBaselineCPUModel (baseline using QEMU) qemu_driver: BaselineHypervisorCPU supports S390 using QEMU/QMP src/qemu/qemu_capabilities.c | 349 +++++++++++++++++++++++++++++------ src/qemu/qemu_capabilities.h | 33 ++++ src/qemu/qemu_driver.c | 74 +++++++- src/qemu/qemu_monitor.c | 117 +++++++++++- src/qemu/qemu_monitor.h | 21 ++- src/qemu/qemu_monitor_json.c | 232 +++++++++++++++++++---- src/qemu/qemu_monitor_json.h | 14 +- tests/cputest.c | 7 +- 8 files changed, 724 insertions(+), 123 deletions(-) -- 2.17.1

4 41

[libvirt] [PATCH] storage: Don't hold storage pool locked during wipeVol
by Michal Privoznik 17 Aug '18

17 Aug '18

Currently the way virStorageVolWipe() works is it looks up pool containing given volume and hold it locked throughout while API execution. This is suboptimal because wiping a volume means writing data to it which can take ages. And if the whole pool is locked during that operation no other API can be issued (nor pool-list). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/storage/storage_backend_iscsi_direct.c | 5 +++++ src/storage/storage_backend_rbd.c | 7 ++++++- src/storage/storage_util.c | 8 +++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 1624066e9c..58d25557f1 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -691,6 +691,9 @@ virStorageBackenISCSIDirectWipeVol(virStoragePoolObjPtr pool, if (!(iscsi = virStorageBackendISCSIDirectSetConnection(pool, NULL))) return -1; + vol->in_use++; + virObjectUnlock(pool); + switch ((virStorageVolWipeAlgorithm) algorithm) { case VIR_STORAGE_VOL_WIPE_ALG_ZERO: if (virStorageBackendISCSIDirectVolWipeZero(vol, iscsi) < 0) { @@ -719,6 +722,8 @@ virStorageBackenISCSIDirectWipeVol(virStoragePoolObjPtr pool, cleanup: virISCSIDirectDisconnect(iscsi); iscsi_destroy_context(iscsi); + virObjectLock(pool); + vol->in_use--; return ret; } diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 642cacb673..30c94c109b 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -1212,7 +1212,10 @@ virStorageBackendRBDVolWipe(virStoragePoolObjPtr pool, VIR_DEBUG("Wiping RBD image %s/%s", def->source.name, vol->name); if (!(ptr = virStorageBackendRBDNewState(pool))) - goto cleanup; + return -1; + + vol->in_use++; + virObjectUnlock(pool); if ((r = rbd_open(ptr->ioctx, vol->name, &image, NULL)) < 0) { virReportSystemError(-r, _("failed to open the RBD image %s"), @@ -1271,6 +1274,8 @@ virStorageBackendRBDVolWipe(virStoragePoolObjPtr pool, rbd_close(image); virStorageBackendRBDFreeState(&ptr); + virObjectLock(pool); + vol->in_use--; return ret; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 42a9b6abf0..5c1fb7b7d3 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2750,7 +2750,7 @@ storageBackendVolWipePloop(virStorageVolDefPtr vol, int -virStorageBackendVolWipeLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendVolWipeLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int algorithm, unsigned int flags) @@ -2759,6 +2759,9 @@ virStorageBackendVolWipeLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virCheckFlags(0, -1); + vol->in_use++; + virObjectUnlock(pool); + VIR_DEBUG("Wiping volume with path '%s' and algorithm %u", vol->target.path, algorithm); @@ -2769,6 +2772,9 @@ virStorageBackendVolWipeLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, vol->target.allocation, false); } + virObjectLock(pool); + vol->in_use--; + return ret; } -- 2.16.4

2 3

[libvirt] Investigation and possible fix of 1361592 - apparmor profiles do not include backing files
by Povilas Kanapickas 17 Aug '18

17 Aug '18

Hi, I've looked into why apparmor profiles do not contain exceptions for backing files of images which later leads to permission errors due to apparmor containment. As of newest libvirt git master, only the first level backing image is included, the subsequent images are omitted. Below is my investigation of why this issue happens. It is based on libvirt git master as of 2018-08-15 (e3e48d7cb82d58). The possible fix is easy, but I don't have the background how to write tests for it, so it's best that someone who knows the project well completes the fix In my case I have the following file hierarchy: - image-master.qcow2 (has backing file image-backing-1.qcow2) - image-backing-1.qcow2 (has backing file image-backing-2.qcow2 - image-backing-2.qcow2 The apparmor profiles are created by the virt-aa-helper tool. The get_files function (src/security/virt-aa-helper.c:949) creates a list of files that need to be accessed by the virtual machine. The call to virDomainDiskDefForeachPath() is responsible for creating the list of files required to access each disk given the disk metadata. The disk->src argument contains the source file. The expected file hierarchy would be this: disk->src->path == path/to/image-master.qcow2 disk->src->backingStore->path == path/to/image-backing-1.qcow2 disk->src->backingStore->backingStore->path == path/to/image-backing-2.qcow2 Unfortunately only the first two levels are present and disk->src->backingStore->backingStore points to a dummy object. The backing store details are filled in virStorageFileGetMetadata() call. It calls into virStorageFileGetMetadataRecurse (src/util/virstoragefile.c:4789) which will collect metadata for a single image and recurse into itself for backing files. For us, the following part of virStorageFileGetMetadataRecurse is important (simplified for brevity): ``` virStorageFileGetMetadataInternal(src, ..., &backingFormat); if (src->backingStoreRaw) { backingStore = ... if (backingFormat == VIR_STORAGE_FILE_AUTO) backingStore->format = VIR_STORAGE_FILE_RAW; [1] else if (backingFormat == VIR_STORAGE_FILE_AUTO_SAFE) backingStore->format = VIR_STORAGE_FILE_AUTO; else backingStore->format = backingFormat; virStorageFileGetMetadataRecurse(backingStore, ...) [2] } ``` The crux of the issue seems that the call to virStorageFileGetMetadataInternal() for the image-master.qcow2 image will set the `backingFormat` return value to VIR_STORAGE_FILE_AUTO. The code responsible is in qcowXGetBackingStore (src/util/virstoragefile.c:491) called via `fileTypeInfo[meta->format].getBackingStore(...)` at src/util/virstoragefile.c:1042. It backingFormat is then downgraded to VIR_STORAGE_FILE_RAW at src/util/virstoragefile.c:4854 ([1] above). This causes the next recurse call to virStorageFileGetMetadataRecurse() ([2] above) to not investigate the backing images at all in virStorageFileGetMetadataInternal() as fileTypeInfo[VIR_STORAGE_FILE_RAW].getBackingStore will be NULL. The possible solution is to return VIR_STORAGE_FILE_AUTO_SAFE from qcowXGetBackingStore. It probably does not make much sense to prevent probing of qcow2 backing images as we probe the first level of backing images anyway, so that return value only affect second and subsequent levels of backing images. Looking into the implementation of qcowXGetBackingStore it also does not seem that it performs any operations that are unsafe by design. Currently VIR_STORAGE_FILE_AUTO is used only in qedGetBackingStore and it does not seem that probing of qcow images is unsafe enough What do the developers think about this? Could someone complete the fix with tests or advise me about the testing frameworks if there's not enough time? Thanks a lot! Povilas

2 3

[libvirt] [PATCH] qemu: hotplug: Fix asynchronous unplug of 'shmem'
by Peter Krempa 17 Aug '18

17 Aug '18

commit 5c81c342a7 forgot to skip the detaching of the shmem backend when async unplug is requested which meant that we've tried to unplug the backend prior to delivery of the DEVICE_DELETED event. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1618622 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_hotplug.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5b52fe9edc..fa490c53e1 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5479,11 +5479,16 @@ qemuDomainDetachShmemDevice(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; - if ((ret = qemuDomainWaitForDeviceRemoval(vm)) == 1) - ret = qemuDomainRemoveShmemDevice(driver, vm, shmem); + if (async) { + ret = 0; + } else { + if ((ret = qemuDomainWaitForDeviceRemoval(vm)) == 1) + ret = qemuDomainRemoveShmemDevice(driver, vm, shmem); + } cleanup: - qemuDomainResetDeviceRemoval(vm); + if (!async) + qemuDomainResetDeviceRemoval(vm); return ret; } -- 2.16.2

2 1

[libvirt] [PATCH 0/3] conf: qemu: support new Hyper-V enlightenments
by Vitaly Kuznetsov 16 Aug '18

16 Aug '18

Several new Hyper-V enlightenments were recently added to Qemu: - hv-frequencies - hv-reenlightenment - hv-tlbflush Support these in libvirt. Vitaly Kuznetsov (3): conf: qemu: add support for Hyper-V frequency MSRs conf: qemu: add support for Hyper-V reenlightenment notifications conf: qemu: add support for Hyper-V PV TLB flush docs/formatdomain.html.in | 21 +++++++++++++++++++++ docs/schemas/domaincommon.rng | 15 +++++++++++++++ src/conf/domain_conf.c | 14 +++++++++++++- src/conf/domain_conf.h | 3 +++ src/cpu/cpu_x86.c | 9 +++++++++ src/cpu/cpu_x86_data.h | 3 +++ src/qemu/qemu_command.c | 3 +++ src/qemu/qemu_parse_command.c | 3 +++ src/qemu/qemu_process.c | 3 +++ tests/qemuxml2argvdata/hyperv-off.xml | 3 +++ tests/qemuxml2argvdata/hyperv.args | 3 ++- tests/qemuxml2argvdata/hyperv.xml | 3 +++ tests/qemuxml2xmloutdata/hyperv-off.xml | 3 +++ tests/qemuxml2xmloutdata/hyperv.xml | 3 +++ 14 files changed, 87 insertions(+), 2 deletions(-) -- 2.14.4

3 5

[libvirt] [PATCH 0/4] Fix a SIGSEGV in libvirtd when querying AMD SEV info
by Erik Skultety 16 Aug '18

16 Aug '18

This series fixes the following BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1612009 TL;DR: We don't format SEV platform data (PDH, certificate chain,...) into our qemu caps cache which poses a problem after libvirtd restart when we restore from the cache and get a segfault upon issuing virNodeGetSEVInfo. I performed some tests on an AMD machine, but CC'ing Brijesh, he might give it a test too. Erik Skultety (4): tests: sev: Test launch-security with specific QEMU version qemu: Define and use a auto cleanup function with virSEVCapability qemu: Fix probing of AMD SEV support qemu: caps: Format SEV platform data into qemuCaps cache src/conf/domain_capabilities.h | 4 + src/qemu/qemu_capabilities.c | 112 +++++++++++++++++++-- src/qemu/qemu_monitor_json.c | 20 ++-- tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 5 +- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 6 ++ tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - ...args => launch-security-sev.x86_64-2.12.0.args} | 19 ++-- tests/qemuxml2argvtest.c | 4 +- 8 files changed, 142 insertions(+), 29 deletions(-) rename tests/qemuxml2argvdata/{launch-security-sev.args => launch-security-sev.x86_64-2.12.0.args} (54%) -- 2.14.4

3 12

[libvirt] [RFC PATCH 00/17] Add vhost-user-gpu support
by marcandre.lureau＠redhat.com 16 Aug '18

16 Aug '18

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, This series of patches add support for running a virtio GPU in a seperate process, using vhost-user. The QEMU series "[PATCH v4 00/29] vhost-user for input & GPU" is still under review, and will hopefully land in 3.1. There are several benefits of running the GPU process in an external process, since Mesa is rather heavy on the qemu main loop, and may block for a while or crash. I observe x5 performance improvements with Unigine Heaven 4 benchmark. The external GPU process is started with one end of the vhost-user socket pair, the other end is given to a QEMU chardev. It is also added to the emulator cgroup to restrict its CPU usage. vhost-user requires shared VM memory. A few preliminary patches ease and improve shared memory setup, when no explicit domain NUMA configuration is given. Also, if there is no need for file-backed memory, teach libvirt to make use of memfd memory backend, which has better security guarantees and is easier to setup. Review welcome! Marc-André Lureau (17): qemu: setup shared memory without explicit numa configuration qemu: add memory-backend-memfd capability check qemu: use memory-backend-memfd if possible qemu: add vhost-user-gpu capabilities domain: add "vhost-user" video type qemu: fill the vhost-user video type capability qemu: check that qemu is vhost-user-vga capable qemu: vhost-user is valid as non-primary video device qemu: validate vhost-user video model qemu: add qemuSecurityStartVhostUserGPU helper qemu: add vhost-user-gpu helper unit qemu: restrict 'virgl=' option to 'virtio' video type qemu: set default address type on vhost-user video model qemu: start/stop the vhost-user-gpu external device qemu: build vhost-user-backend for vhost-user-gpu qemu: build vhost-user-gpu video device arguments tests: add vhost-user-gpu xml2argv tests docs/formatdomain.html.in | 5 +- docs/schemas/domaincommon.rng | 1 + src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 1 + src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_capabilities.c | 10 + src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_command.c | 191 ++++++++--- src/qemu/qemu_domain.c | 8 +- src/qemu/qemu_domain_address.c | 4 +- src/qemu/qemu_extdevice.c | 47 ++- src/qemu/qemu_process.c | 6 +- src/qemu/qemu_security.c | 48 +++ src/qemu/qemu_security.h | 6 + src/qemu/qemu_vhost_user_gpu.c | 318 ++++++++++++++++++ src/qemu/qemu_vhost_user_gpu.h | 48 +++ tests/domaincapsschemadata/full.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../fd-memory-no-numa-topology.args | 4 + tests/qemuxml2argvdata/memfd.args | 28 ++ tests/qemuxml2argvdata/memfd.xml | 32 ++ .../vhost-user-gpu-secondary.args | 34 ++ .../vhost-user-gpu-secondary.xml | 38 +++ tests/qemuxml2argvdata/vhost-user-vga.args | 31 ++ tests/qemuxml2argvdata/vhost-user-vga.xml | 35 ++ tests/qemuxml2argvtest.c | 14 + 32 files changed, 877 insertions(+), 51 deletions(-) create mode 100644 src/qemu/qemu_vhost_user_gpu.c create mode 100644 src/qemu/qemu_vhost_user_gpu.h create mode 100644 tests/qemuxml2argvdata/memfd.args create mode 100644 tests/qemuxml2argvdata/memfd.xml create mode 100644 tests/qemuxml2argvdata/vhost-user-gpu-secondary.args create mode 100644 tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml create mode 100644 tests/qemuxml2argvdata/vhost-user-vga.args create mode 100644 tests/qemuxml2argvdata/vhost-user-vga.xml -- 2.18.0.129.ge3331758f1

5 25

[libvirt] [libvirt-glib][PATCH] configure: Drop GLIB2_TEST_REQUIRED
by Michal Privoznik 16 Aug '18

16 Aug '18

Introduced in eb1f97a4b49a6e it is not needed anymore. The minimal required version of glib is now the same as the one required for tests. This practically reverts the referenced commit. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- configure.ac | 8 +------- tests/Makefile.am | 3 --- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index dd1a85a..adc9e6b 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,6 @@ LIBVIRT_REQUIRED=1.2.5 AC_SUBST([LIBVIRT_REQUIRED]) dnl used in the .spec file GLIB2_REQUIRED=2.38.0 AC_SUBST([GLIB2_REQUIRED]) dnl used in the .spec file -GLIB2_TEST_REQUIRED=2.38.0 GOBJECT_INTROSPECTION_REQUIRED=1.36.0 LIBXML2_REQUIRED=2.0.0 @@ -107,17 +106,12 @@ PKG_CHECK_EXISTS(libvirt >= 1.2.6, AC_DEFINE([HAVE_VIR_NETWORK_GET_DHCP_LEASES], 1, [Have virNetworkGetDHCPLeases?]) AC_MSG_RESULT([yes]) ],[AC_MSG_RESULT([no])]) -enable_tests=no -PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_TEST_REQUIRED, - [enable_tests=yes], - [PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED)]) +PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(GTHREAD2, gthread-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(GOBJECT2, gobject-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(GIO2, gio-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED) -AM_CONDITIONAL([ENABLE_TESTS], [test "$enable_tests" = "yes"]) - LIBVIRT_GLIB_GETTEXT dnl Should be in m4/virt-gettext.m4 but intltoolize is too dnl dumb to find it there diff --git a/tests/Makefile.am b/tests/Makefile.am index 3f4ef6c..2fa847a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,3 @@ -if ENABLE_TESTS - include $(top_srcdir)/build-aux/glib-tap.mk AM_CFLAGS = \ @@ -22,4 +20,3 @@ test_programs = test-gconfig test-events EXTRA_DIST += \ xml \ $(NULL) -endif -- 2.16.4

2 1

[libvirt] [libvirt-glib][PATCH v2] Use new GObject define macros with private
by Michal Privoznik 16 Aug '18

16 Aug '18

G_ADD_PRIVATE was added in 2.38 and older functions are getting deprecated: https://gitlab.gnome.org/GNOME/glib/merge_requests/7/commits This also means, that the minimal required glib version is increased to 2.38. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - increased minimal glib version in configure.ac configure.ac | 2 +- libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c | 3 +-- libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-guest.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-host.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-address-pci.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-address-usb.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-address.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-channel.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-chardev.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-clock.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-console.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-controller.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-cpu.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-device.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-graphics.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-hostdev-pci.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-hostdev.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-input.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c | 5 ++--- .../libvirt-gconfig-domain-interface-filterref-parameter.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-interface-network.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-interface-user.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-interface.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-memballoon.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-os.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-parallel.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-power-management.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-redirdev.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-seclabel.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-serial.c | 5 ++--- .../libvirt-gconfig-domain-smartcard-host-certificates.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-smartcard.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-snapshot.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-sound.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-timer.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-video.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain.c | 3 +-- libvirt-gconfig/libvirt-gconfig-interface.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-network-filter.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-network.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-node-device.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-object.c | 4 +--- libvirt-gconfig/libvirt-gconfig-secret.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-permissions.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-pool-source.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-pool-target.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-pool.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-vol-target.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-vol.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-xml-doc.c | 3 +-- libvirt-gobject/libvirt-gobject-connection.c | 3 +-- libvirt-gobject/libvirt-gobject-domain-device.c | 1 - libvirt-gobject/libvirt-gobject-domain-disk.c | 5 ++--- libvirt-gobject/libvirt-gobject-domain-interface.c | 5 ++--- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 3 +-- libvirt-gobject/libvirt-gobject-domain.c | 3 +-- libvirt-gobject/libvirt-gobject-input-stream.c | 7 +++---- libvirt-gobject/libvirt-gobject-interface.c | 3 +-- libvirt-gobject/libvirt-gobject-manager.c | 3 +-- libvirt-gobject/libvirt-gobject-network-dhcp-lease.c | 3 +-- libvirt-gobject/libvirt-gobject-network-filter.c | 3 +-- libvirt-gobject/libvirt-gobject-network.c | 3 +-- libvirt-gobject/libvirt-gobject-node-device.c | 3 +-- libvirt-gobject/libvirt-gobject-output-stream.c | 7 +++---- libvirt-gobject/libvirt-gobject-secret.c | 3 +-- libvirt-gobject/libvirt-gobject-storage-pool.c | 3 +-- libvirt-gobject/libvirt-gobject-storage-vol.c | 3 +-- libvirt-gobject/libvirt-gobject-stream.c | 3 +-- 100 files changed, 172 insertions(+), 272 deletions(-) diff --git a/configure.ac b/configure.ac index 05b9628..dd1a85a 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AM_SILENT_RULES([yes]) LIBVIRT_REQUIRED=1.2.5 AC_SUBST([LIBVIRT_REQUIRED]) dnl used in the .spec file -GLIB2_REQUIRED=2.36.0 +GLIB2_REQUIRED=2.38.0 AC_SUBST([GLIB2_REQUIRED]) dnl used in the .spec file GLIB2_TEST_REQUIRED=2.38.0 GOBJECT_INTROSPECTION_REQUIRED=1.36.0 diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c index b52c0bf..3b0a47d 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c @@ -35,11 +35,10 @@ struct _GVirConfigCapabilitiesCpuFeaturePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesCpuFeature, gvir_config_capabilities_cpu_feature, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesCpuFeature, gvir_config_capabilities_cpu_feature, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_cpu_feature_class_init(GVirConfigCapabilitiesCpuFeatureClass *klass) +static void gvir_config_capabilities_cpu_feature_class_init(GVirConfigCapabilitiesCpuFeatureClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesCpuFeaturePrivate)); } static void gvir_config_capabilities_cpu_feature_init(GVirConfigCapabilitiesCpuFeature *feature) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c index 14630a0..21b6c18 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c @@ -33,11 +33,10 @@ struct _GVirConfigCapabilitiesCpuModelPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesCpuModel, gvir_config_capabilities_cpu_model, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesCpuModel, gvir_config_capabilities_cpu_model, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_cpu_model_class_init(GVirConfigCapabilitiesCpuModelClass *klass) +static void gvir_config_capabilities_cpu_model_class_init(GVirConfigCapabilitiesCpuModelClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesCpuModelPrivate)); } static void gvir_config_capabilities_cpu_model_init(GVirConfigCapabilitiesCpuModel *model) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c index 1ff879a..f4edc5c 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c @@ -35,11 +35,10 @@ struct _GVirConfigCapabilitiesCpuTopologyPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesCpuTopology, gvir_config_capabilities_cpu_topology, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesCpuTopology, gvir_config_capabilities_cpu_topology, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_cpu_topology_class_init(GVirConfigCapabilitiesCpuTopologyClass *klass) +static void gvir_config_capabilities_cpu_topology_class_init(GVirConfigCapabilitiesCpuTopologyClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesCpuTopologyPrivate)); } static void gvir_config_capabilities_cpu_topology_init(GVirConfigCapabilitiesCpuTopology *topology) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c index 913c759..1056bbd 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c @@ -35,14 +35,13 @@ struct _GVirConfigCapabilitiesCpuPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesCpu, gvir_config_capabilities_cpu, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesCpu, gvir_config_capabilities_cpu, GVIR_CONFIG_TYPE_OBJECT); static GList * _gvir_config_capabilities_cpu_get_features(GVirConfigCapabilitiesCpu *cpu); static void gvir_config_capabilities_cpu_class_init(GVirConfigCapabilitiesCpuClass *klass) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesCpuPrivate)); klass->get_features = _gvir_config_capabilities_cpu_get_features; } diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c index 8da33dc..70c2885 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c @@ -35,11 +35,10 @@ struct _GVirConfigCapabilitiesGuestArchPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesGuestArch, gvir_config_capabilities_guest_arch, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesGuestArch, gvir_config_capabilities_guest_arch, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_guest_arch_class_init(GVirConfigCapabilitiesGuestArchClass *klass) +static void gvir_config_capabilities_guest_arch_class_init(GVirConfigCapabilitiesGuestArchClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesGuestArchPrivate)); } static void gvir_config_capabilities_guest_arch_init(GVirConfigCapabilitiesGuestArch *arch) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c index 3162ea1..5e438b1 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c @@ -35,12 +35,11 @@ struct _GVirConfigCapabilitiesGuestDomainPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesGuestDomain, gvir_config_capabilities_guest_domain, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesGuestDomain, gvir_config_capabilities_guest_domain, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_guest_domain_class_init(GVirConfigCapabilitiesGuestDomainClass *klass) +static void gvir_config_capabilities_guest_domain_class_init(GVirConfigCapabilitiesGuestDomainClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesGuestDomainPrivate)); } static void gvir_config_capabilities_guest_domain_init(GVirConfigCapabilitiesGuestDomain *domain) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c index 9e9533a..036f38b 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c @@ -35,11 +35,10 @@ struct _GVirConfigCapabilitiesGuestFeaturePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesGuestFeature, gvir_config_capabilities_guest_feature, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesGuestFeature, gvir_config_capabilities_guest_feature, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_guest_feature_class_init(GVirConfigCapabilitiesGuestFeatureClass *klass) +static void gvir_config_capabilities_guest_feature_class_init(GVirConfigCapabilitiesGuestFeatureClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesGuestFeaturePrivate)); } static void gvir_config_capabilities_guest_feature_init(GVirConfigCapabilitiesGuestFeature *feature) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-guest.c b/libvirt-gconfig/libvirt-gconfig-capabilities-guest.c index 128b22f..4d4e499 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-guest.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-guest.c @@ -35,12 +35,11 @@ struct _GVirConfigCapabilitiesGuestPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesGuest, gvir_config_capabilities_guest, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesGuest, gvir_config_capabilities_guest, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_guest_class_init(GVirConfigCapabilitiesGuestClass *klass) +static void gvir_config_capabilities_guest_class_init(GVirConfigCapabilitiesGuestClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesGuestPrivate)); } static void gvir_config_capabilities_guest_init(GVirConfigCapabilitiesGuest *guest) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c b/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c index 77e0593..2f76db2 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c @@ -33,11 +33,10 @@ struct _GVirConfigCapabilitiesHostSecModelPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesHostSecModel, gvir_config_capabilities_host_secmodel, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesHostSecModel, gvir_config_capabilities_host_secmodel, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_host_secmodel_class_init(GVirConfigCapabilitiesHostSecModelClass *klass) +static void gvir_config_capabilities_host_secmodel_class_init(GVirConfigCapabilitiesHostSecModelClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesHostSecModelPrivate)); } static void gvir_config_capabilities_host_secmodel_init(GVirConfigCapabilitiesHostSecModel *secmodel) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-host.c b/libvirt-gconfig/libvirt-gconfig-capabilities-host.c index e26c2d0..30a574e 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-host.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-host.c @@ -35,12 +35,11 @@ struct _GVirConfigCapabilitiesHostPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesHost, gvir_config_capabilities_host, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesHost, gvir_config_capabilities_host, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_host_class_init(GVirConfigCapabilitiesHostClass *klass) +static void gvir_config_capabilities_host_class_init(GVirConfigCapabilitiesHostClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesHostPrivate)); } static void gvir_config_capabilities_host_init(GVirConfigCapabilitiesHost *host) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities.c b/libvirt-gconfig/libvirt-gconfig-capabilities.c index 6cc5256..2b24696 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities.c @@ -34,12 +34,11 @@ struct _GVirConfigCapabilitiesPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilities, gvir_config_capabilities, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilities, gvir_config_capabilities, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_class_init(GVirConfigCapabilitiesClass *klass) +static void gvir_config_capabilities_class_init(GVirConfigCapabilitiesClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c b/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c index 0105402..6b19702 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainAddressPciPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainAddressPci, gvir_config_domain_address_pci, GVIR_CONFIG_TYPE_DOMAIN_ADDRESS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainAddressPci, gvir_config_domain_address_pci, GVIR_CONFIG_TYPE_DOMAIN_ADDRESS); -static void gvir_config_domain_address_pci_class_init(GVirConfigDomainAddressPciClass *klass) +static void gvir_config_domain_address_pci_class_init(GVirConfigDomainAddressPciClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainAddressPciPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c b/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c index a794922..8f31757 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainAddressUsbPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainAddressUsb, gvir_config_domain_address_usb, GVIR_CONFIG_TYPE_DOMAIN_ADDRESS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainAddressUsb, gvir_config_domain_address_usb, GVIR_CONFIG_TYPE_DOMAIN_ADDRESS); -static void gvir_config_domain_address_usb_class_init(GVirConfigDomainAddressUsbClass *klass) +static void gvir_config_domain_address_usb_class_init(GVirConfigDomainAddressUsbClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainAddressUsbPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address.c b/libvirt-gconfig/libvirt-gconfig-domain-address.c index c0f6ba6..b070a1f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address.c @@ -36,9 +36,8 @@ struct _GVirConfigDomainAddressPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainAddress, gvir_config_domain_address, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_address_class_init(GVirConfigDomainAddressClass *klass) +static void gvir_config_domain_address_class_init(GVirConfigDomainAddressClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainAddressPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-channel.c b/libvirt-gconfig/libvirt-gconfig-domain-channel.c index 20e79e3..3e820dd 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-channel.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-channel.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainChannelPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainChannel, gvir_config_domain_channel, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainChannel, gvir_config_domain_channel, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); -static void gvir_config_domain_channel_class_init(GVirConfigDomainChannelClass *klass) +static void gvir_config_domain_channel_class_init(GVirConfigDomainChannelClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChannelPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c index c9fadc8..4ccd430 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c @@ -34,12 +34,11 @@ struct _GVirConfigDomainChardevSourcePtyPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainChardevSourcePty, gvir_config_domain_chardev_source_pty, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainChardevSourcePty, gvir_config_domain_chardev_source_pty, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); -static void gvir_config_domain_chardev_source_pty_class_init(GVirConfigDomainChardevSourcePtyClass *klass) +static void gvir_config_domain_chardev_source_pty_class_init(GVirConfigDomainChardevSourcePtyClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevSourcePtyPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c index 98ff221..7f98578 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c @@ -31,12 +31,11 @@ struct _GVirConfigDomainChardevSourceSpicePortPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainChardevSourceSpicePort, gvir_config_domain_chardev_source_spiceport, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainChardevSourceSpicePort, gvir_config_domain_chardev_source_spiceport, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); -static void gvir_config_domain_chardev_source_spiceport_class_init(GVirConfigDomainChardevSourceSpicePortClass *klass) +static void gvir_config_domain_chardev_source_spiceport_class_init(GVirConfigDomainChardevSourceSpicePortClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevSourceSpicePortPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c index d0b876b..2f63acb 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainChardevSourceSpiceVmcPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainChardevSourceSpiceVmc, gvir_config_domain_chardev_source_spicevmc, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainChardevSourceSpiceVmc, gvir_config_domain_chardev_source_spicevmc, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); -static void gvir_config_domain_chardev_source_spicevmc_class_init(GVirConfigDomainChardevSourceSpiceVmcClass *klass) +static void gvir_config_domain_chardev_source_spicevmc_class_init(GVirConfigDomainChardevSourceSpiceVmcClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevSourceSpiceVmcPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c index 069340f..854d413 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c @@ -34,12 +34,11 @@ struct _GVirConfigDomainChardevSourceUnixPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainChardevSourceUnix, gvir_config_domain_chardev_source_unix, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainChardevSourceUnix, gvir_config_domain_chardev_source_unix, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); -static void gvir_config_domain_chardev_source_unix_class_init(GVirConfigDomainChardevSourceUnixClass *klass) +static void gvir_config_domain_chardev_source_unix_class_init(GVirConfigDomainChardevSourceUnixClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevSourceUnixPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c index 117dbe1..50d4030 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c @@ -37,9 +37,8 @@ struct _GVirConfigDomainChardevSourcePrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainChardevSource, gvir_config_domain_chardev_source, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_chardev_source_class_init(GVirConfigDomainChardevSourceClass *klass) +static void gvir_config_domain_chardev_source_class_init(GVirConfigDomainChardevSourceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevSourcePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev.c index fd5e4c9..a5ebc9c 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev.c @@ -36,9 +36,8 @@ struct _GVirConfigDomainChardevPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainChardev, gvir_config_domain_chardev, GVIR_CONFIG_TYPE_DOMAIN_DEVICE) -static void gvir_config_domain_chardev_class_init(GVirConfigDomainChardevClass *klass) +static void gvir_config_domain_chardev_class_init(GVirConfigDomainChardevClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-clock.c b/libvirt-gconfig/libvirt-gconfig-domain-clock.c index 9795565..ae33623 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-clock.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-clock.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainClockPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainClock, gvir_config_domain_clock, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainClock, gvir_config_domain_clock, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_clock_class_init(GVirConfigDomainClockClass *klass) +static void gvir_config_domain_clock_class_init(GVirConfigDomainClockClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainClockPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-console.c b/libvirt-gconfig/libvirt-gconfig-domain-console.c index 5192870..ae75e11 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-console.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-console.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainConsolePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainConsole, gvir_config_domain_console, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainConsole, gvir_config_domain_console, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); -static void gvir_config_domain_console_class_init(GVirConfigDomainConsoleClass *klass) +static void gvir_config_domain_console_class_init(GVirConfigDomainConsoleClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainConsolePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c b/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c index 4262465..a15db27 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c @@ -111,12 +111,11 @@ struct _GVirConfigDomainControllerUsbPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainControllerUsb, gvir_config_domain_controller_usb, GVIR_CONFIG_TYPE_DOMAIN_CONTROLLER); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainControllerUsb, gvir_config_domain_controller_usb, GVIR_CONFIG_TYPE_DOMAIN_CONTROLLER); -static void gvir_config_domain_controller_usb_class_init(GVirConfigDomainControllerUsbClass *klass) +static void gvir_config_domain_controller_usb_class_init(GVirConfigDomainControllerUsbClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainControllerUsbPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-controller.c b/libvirt-gconfig/libvirt-gconfig-domain-controller.c index 82994fe..a2d40c3 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-controller.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-controller.c @@ -36,9 +36,8 @@ struct _GVirConfigDomainControllerPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainController, gvir_config_domain_controller, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_controller_class_init(GVirConfigDomainControllerClass *klass) +static void gvir_config_domain_controller_class_init(GVirConfigDomainControllerClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainControllerPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c b/libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c index dc5fa4e..61f0465 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c @@ -35,11 +35,10 @@ struct _GVirConfigDomainCpuFeaturePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainCpuFeature, gvir_config_domain_cpu_feature, GVIR_CONFIG_TYPE_CAPABILITIES_CPU_FEATURE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainCpuFeature, gvir_config_domain_cpu_feature, GVIR_CONFIG_TYPE_CAPABILITIES_CPU_FEATURE); -static void gvir_config_domain_cpu_feature_class_init(GVirConfigDomainCpuFeatureClass *klass) +static void gvir_config_domain_cpu_feature_class_init(GVirConfigDomainCpuFeatureClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainCpuFeaturePrivate)); } static void gvir_config_domain_cpu_feature_init(GVirConfigDomainCpuFeature *feature) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c b/libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c index 06a3ec8..6478427 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c @@ -33,13 +33,12 @@ struct _GVirConfigDomainCpuModelPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainCpuModel, +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainCpuModel, gvir_config_domain_cpu_model, GVIR_CONFIG_TYPE_CAPABILITIES_CPU_MODEL); -static void gvir_config_domain_cpu_model_class_init(GVirConfigDomainCpuModelClass *klass) +static void gvir_config_domain_cpu_model_class_init(GVirConfigDomainCpuModelClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainCpuModelPrivate)); } static void gvir_config_domain_cpu_model_init(GVirConfigDomainCpuModel *model) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-cpu.c b/libvirt-gconfig/libvirt-gconfig-domain-cpu.c index 2dffae3..55a2704 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-cpu.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-cpu.c @@ -35,7 +35,7 @@ struct _GVirConfigDomainCpuPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainCpu, gvir_config_domain_cpu, GVIR_CONFIG_TYPE_CAPABILITIES_CPU); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainCpu, gvir_config_domain_cpu, GVIR_CONFIG_TYPE_CAPABILITIES_CPU); static GList * _gvir_config_domain_cpu_get_features(GVirConfigCapabilitiesCpu *cpu); @@ -47,7 +47,6 @@ static void gvir_config_domain_cpu_class_init(GVirConfigDomainCpuClass *klass) capabilities_class = GVIR_CONFIG_CAPABILITIES_CPU_CLASS(klass); capabilities_class->get_features = _gvir_config_domain_cpu_get_features; - g_type_class_add_private(klass, sizeof(GVirConfigDomainCpuPrivate)); } static void gvir_config_domain_cpu_init(GVirConfigDomainCpu *cpu) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device.c b/libvirt-gconfig/libvirt-gconfig-domain-device.c index 2475519..b585b39 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-device.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainDevicePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainDevice, gvir_config_domain_device, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainDevice, gvir_config_domain_device, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_device_class_init(GVirConfigDomainDeviceClass *klass) +static void gvir_config_domain_device_class_init(GVirConfigDomainDeviceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainDevicePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c b/libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c index fb05e18..464fb1a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainDiskDriverPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainDiskDriver, gvir_config_domain_disk_driver, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainDiskDriver, gvir_config_domain_disk_driver, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_disk_driver_class_init(GVirConfigDomainDiskDriverClass *klass) +static void gvir_config_domain_disk_driver_class_init(GVirConfigDomainDiskDriverClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainDiskDriverPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index 75aaa12..d97a285 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainDiskPrivate GVirConfigDomainDiskType type; }; -G_DEFINE_TYPE(GVirConfigDomainDisk, gvir_config_domain_disk, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainDisk, gvir_config_domain_disk, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_disk_class_init(GVirConfigDomainDiskClass *klass) +static void gvir_config_domain_disk_class_init(GVirConfigDomainDiskClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainDiskPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c index 56c3a01..9a029e4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainFilesysPrivate GVirConfigDomainFilesysType type; }; -G_DEFINE_TYPE(GVirConfigDomainFilesys, gvir_config_domain_filesys, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainFilesys, gvir_config_domain_filesys, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_filesys_class_init(GVirConfigDomainFilesysClass *klass) +static void gvir_config_domain_filesys_class_init(GVirConfigDomainFilesysClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainFilesysPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c index dadf684..2ae984f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainGraphicsDesktopPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainGraphicsDesktop, gvir_config_domain_graphics_desktop, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainGraphicsDesktop, gvir_config_domain_graphics_desktop, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); -static void gvir_config_domain_graphics_desktop_class_init(GVirConfigDomainGraphicsDesktopClass *klass) +static void gvir_config_domain_graphics_desktop_class_init(GVirConfigDomainGraphicsDesktopClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsDesktopPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c index 7a2cb4d..4f7ef0f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainGraphicsRdpPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainGraphicsRdp, gvir_config_domain_graphics_rdp, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainGraphicsRdp, gvir_config_domain_graphics_rdp, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); -static void gvir_config_domain_graphics_rdp_class_init(GVirConfigDomainGraphicsRdpClass *klass) +static void gvir_config_domain_graphics_rdp_class_init(GVirConfigDomainGraphicsRdpClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsRdpPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c index 1740494..cbf8410 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainGraphicsSdlPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainGraphicsSdl, gvir_config_domain_graphics_sdl, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainGraphicsSdl, gvir_config_domain_graphics_sdl, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); -static void gvir_config_domain_graphics_sdl_class_init(GVirConfigDomainGraphicsSdlClass *klass) +static void gvir_config_domain_graphics_sdl_class_init(GVirConfigDomainGraphicsSdlClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsSdlPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c index 079ea27..9e3570e 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c @@ -34,12 +34,11 @@ struct _GVirConfigDomainGraphicsSpicePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainGraphicsSpice, gvir_config_domain_graphics_spice, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainGraphicsSpice, gvir_config_domain_graphics_spice, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); -static void gvir_config_domain_graphics_spice_class_init(GVirConfigDomainGraphicsSpiceClass *klass) +static void gvir_config_domain_graphics_spice_class_init(GVirConfigDomainGraphicsSpiceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsSpicePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c index fc26bb9..4c78b11 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainGraphicsVncPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainGraphicsVnc, gvir_config_domain_graphics_vnc, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainGraphicsVnc, gvir_config_domain_graphics_vnc, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); -static void gvir_config_domain_graphics_vnc_class_init(GVirConfigDomainGraphicsVncClass *klass) +static void gvir_config_domain_graphics_vnc_class_init(GVirConfigDomainGraphicsVncClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsVncPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c index 8b06e95..e35976f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c @@ -36,9 +36,8 @@ struct _GVirConfigDomainGraphicsPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainGraphics, gvir_config_domain_graphics, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_graphics_class_init(GVirConfigDomainGraphicsClass *klass) +static void gvir_config_domain_graphics_class_init(GVirConfigDomainGraphicsClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-hostdev-pci.c b/libvirt-gconfig/libvirt-gconfig-domain-hostdev-pci.c index c789c9c..36841e5 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-hostdev-pci.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-hostdev-pci.c @@ -34,11 +34,10 @@ struct _GVirConfigDomainHostdevPciPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainHostdevPci, gvir_config_domain_hostdev_pci, GVIR_CONFIG_TYPE_DOMAIN_HOSTDEV); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainHostdevPci, gvir_config_domain_hostdev_pci, GVIR_CONFIG_TYPE_DOMAIN_HOSTDEV); -static void gvir_config_domain_hostdev_pci_class_init(GVirConfigDomainHostdevPciClass *klass) +static void gvir_config_domain_hostdev_pci_class_init(GVirConfigDomainHostdevPciClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainHostdevPciPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-hostdev.c b/libvirt-gconfig/libvirt-gconfig-domain-hostdev.c index 459674d..ade2dc3 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-hostdev.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-hostdev.c @@ -37,9 +37,8 @@ struct _GVirConfigDomainHostdevPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainHostdev, gvir_config_domain_hostdev, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_hostdev_class_init(GVirConfigDomainHostdevClass *klass) +static void gvir_config_domain_hostdev_class_init(GVirConfigDomainHostdevClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainHostdevPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-input.c b/libvirt-gconfig/libvirt-gconfig-domain-input.c index 7734c61..9d7de77 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-input.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-input.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainInputPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainInput, gvir_config_domain_input, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainInput, gvir_config_domain_input, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_input_class_init(GVirConfigDomainInputClass *klass) +static void gvir_config_domain_input_class_init(GVirConfigDomainInputClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInputPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c index a10b3c1..33ba27b 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c @@ -36,12 +36,11 @@ struct _GVirConfigDomainInterfaceBridgePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainInterfaceBridge, gvir_config_domain_interface_bridge, GVIR_CONFIG_TYPE_DOMAIN_INTERFACE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainInterfaceBridge, gvir_config_domain_interface_bridge, GVIR_CONFIG_TYPE_DOMAIN_INTERFACE); -static void gvir_config_domain_interface_bridge_class_init(GVirConfigDomainInterfaceBridgeClass *klass) +static void gvir_config_domain_interface_bridge_class_init(GVirConfigDomainInterfaceBridgeClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceBridgePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c index abca213..e166482 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c @@ -35,11 +35,10 @@ struct _GVirConfigDomainInterfaceFilterrefParameterPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainInterfaceFilterrefParameter, gvir_config_domain_interface_filterref_parameter, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainInterfaceFilterrefParameter, gvir_config_domain_interface_filterref_parameter, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_interface_filterref_parameter_class_init(GVirConfigDomainInterfaceFilterrefParameterClass *klass) +static void gvir_config_domain_interface_filterref_parameter_class_init(GVirConfigDomainInterfaceFilterrefParameterClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceFilterrefParameterPrivate)); } static void gvir_config_domain_interface_filterref_parameter_init(GVirConfigDomainInterfaceFilterrefParameter *parameter) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c index 132d9f5..a73b6a8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c @@ -34,11 +34,10 @@ struct _GVirConfigDomainInterfaceFilterrefPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainInterfaceFilterref, gvir_config_domain_interface_filterref, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainInterfaceFilterref, gvir_config_domain_interface_filterref, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_interface_filterref_class_init(GVirConfigDomainInterfaceFilterrefClass *klass) +static void gvir_config_domain_interface_filterref_class_init(GVirConfigDomainInterfaceFilterrefClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceFilterrefPrivate)); } static void gvir_config_domain_interface_filterref_init(GVirConfigDomainInterfaceFilterref *filterref) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c index 27ad6ed..7083ad1 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c @@ -35,12 +35,11 @@ struct _GVirConfigDomainInterfaceNetworkPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainInterfaceNetwork, gvir_config_domain_interface_network, GVIR_CONFIG_TYPE_DOMAIN_INTERFACE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainInterfaceNetwork, gvir_config_domain_interface_network, GVIR_CONFIG_TYPE_DOMAIN_INTERFACE); -static void gvir_config_domain_interface_network_class_init(GVirConfigDomainInterfaceNetworkClass *klass) +static void gvir_config_domain_interface_network_class_init(GVirConfigDomainInterfaceNetworkClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceNetworkPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c index d5672d6..514d49c 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c @@ -35,12 +35,11 @@ struct _GVirConfigDomainInterfaceUserPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainInterfaceUser, gvir_config_domain_interface_user, GVIR_CONFIG_TYPE_DOMAIN_INTERFACE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainInterfaceUser, gvir_config_domain_interface_user, GVIR_CONFIG_TYPE_DOMAIN_INTERFACE); -static void gvir_config_domain_interface_user_class_init(GVirConfigDomainInterfaceUserClass *klass) +static void gvir_config_domain_interface_user_class_init(GVirConfigDomainInterfaceUserClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceUserPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c b/libvirt-gconfig/libvirt-gconfig-domain-interface.c index c5b57bd..2b841b3 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c @@ -38,9 +38,8 @@ struct _GVirConfigDomainInterfacePrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainInterface, gvir_config_domain_interface, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_interface_class_init(GVirConfigDomainInterfaceClass *klass) +static void gvir_config_domain_interface_class_init(GVirConfigDomainInterfaceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfacePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c b/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c index c5d7768..509064e 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainMemballoonPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainMemballoon, gvir_config_domain_memballoon, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainMemballoon, gvir_config_domain_memballoon, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_memballoon_class_init(GVirConfigDomainMemballoonClass *klass) +static void gvir_config_domain_memballoon_class_init(GVirConfigDomainMemballoonClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainMemballoonPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.c b/libvirt-gconfig/libvirt-gconfig-domain-os.c index 9a00ef4..f12e1e7 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainOsPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainOs, gvir_config_domain_os, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainOs, gvir_config_domain_os, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_os_class_init(GVirConfigDomainOsClass *klass) +static void gvir_config_domain_os_class_init(GVirConfigDomainOsClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainOsPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-parallel.c b/libvirt-gconfig/libvirt-gconfig-domain-parallel.c index f48d1b6..d523f06 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-parallel.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-parallel.c @@ -32,12 +32,11 @@ struct _GVirConfigDomainParallelPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainParallel, gvir_config_domain_parallel, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainParallel, gvir_config_domain_parallel, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); -static void gvir_config_domain_parallel_class_init(GVirConfigDomainParallelClass *klass) +static void gvir_config_domain_parallel_class_init(GVirConfigDomainParallelClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainParallelPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-power-management.c b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c index c070a0f..7488e7a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-power-management.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c @@ -38,14 +38,13 @@ struct _GVirConfigDomainPowerManagementPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainPowerManagement, +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainPowerManagement, gvir_config_domain_power_management, GVIR_CONFIG_TYPE_OBJECT); static void gvir_config_domain_power_management_class_init - (GVirConfigDomainPowerManagementClass *klass) + (GVirConfigDomainPowerManagementClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainPowerManagementPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-redirdev.c b/libvirt-gconfig/libvirt-gconfig-domain-redirdev.c index 5fd4dda..1d1b321 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-redirdev.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-redirdev.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainRedirdevPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainRedirdev, gvir_config_domain_redirdev, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainRedirdev, gvir_config_domain_redirdev, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); -static void gvir_config_domain_redirdev_class_init(GVirConfigDomainRedirdevClass *klass) +static void gvir_config_domain_redirdev_class_init(GVirConfigDomainRedirdevClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainRedirdevPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c index 77d8aa0..acb8fa2 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainSeclabelPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSeclabel, gvir_config_domain_seclabel, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSeclabel, gvir_config_domain_seclabel, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_seclabel_class_init(GVirConfigDomainSeclabelClass *klass) +static void gvir_config_domain_seclabel_class_init(GVirConfigDomainSeclabelClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSeclabelPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-serial.c b/libvirt-gconfig/libvirt-gconfig-domain-serial.c index 84adb2a..2523f4a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-serial.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-serial.c @@ -32,12 +32,11 @@ struct _GVirConfigDomainSerialPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSerial, gvir_config_domain_serial, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSerial, gvir_config_domain_serial, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); -static void gvir_config_domain_serial_class_init(GVirConfigDomainSerialClass *klass) +static void gvir_config_domain_serial_class_init(GVirConfigDomainSerialClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSerialPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c index ab5abc4..be90d3a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainSmartcardHostCertificatesPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSmartcardHostCertificates, gvir_config_domain_smartcard_host_certificates, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSmartcardHostCertificates, gvir_config_domain_smartcard_host_certificates, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); -static void gvir_config_domain_smartcard_host_certificates_class_init(GVirConfigDomainSmartcardHostCertificatesClass *klass) +static void gvir_config_domain_smartcard_host_certificates_class_init(GVirConfigDomainSmartcardHostCertificatesClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardHostCertificatesPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c index b29e07b..4ef8b90 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainSmartcardHostPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSmartcardHost, gvir_config_domain_smartcard_host, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSmartcardHost, gvir_config_domain_smartcard_host, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); -static void gvir_config_domain_smartcard_host_class_init(GVirConfigDomainSmartcardHostClass *klass) +static void gvir_config_domain_smartcard_host_class_init(GVirConfigDomainSmartcardHostClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardHostPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c index 830faa4..2d2fb97 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainSmartcardPassthroughPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSmartcardPassthrough, gvir_config_domain_smartcard_passthrough, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSmartcardPassthrough, gvir_config_domain_smartcard_passthrough, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); -static void gvir_config_domain_smartcard_passthrough_class_init(GVirConfigDomainSmartcardPassthroughClass *klass) +static void gvir_config_domain_smartcard_passthrough_class_init(GVirConfigDomainSmartcardPassthroughClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardPassthroughPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c index 7900c1a..f7c65f0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c @@ -36,9 +36,8 @@ struct _GVirConfigDomainSmartcardPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainSmartcard, gvir_config_domain_smartcard, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_smartcard_class_init(GVirConfigDomainSmartcardClass *klass) +static void gvir_config_domain_smartcard_class_init(GVirConfigDomainSmartcardClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c index ba7a40e..041f6db 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c @@ -34,12 +34,11 @@ struct _GVirConfigDomainSnapshotDiskPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSnapshotDisk, gvir_config_domain_snapshot_disk, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSnapshotDisk, gvir_config_domain_snapshot_disk, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_snapshot_disk_class_init(GVirConfigDomainSnapshotDiskClass *klass) +static void gvir_config_domain_snapshot_disk_class_init(GVirConfigDomainSnapshotDiskClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSnapshotDiskPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c index 69b7df7..ae79932 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c @@ -35,12 +35,11 @@ struct _GVirConfigDomainSnapshotPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSnapshot, gvir_config_domain_snapshot, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSnapshot, gvir_config_domain_snapshot, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_snapshot_class_init(GVirConfigDomainSnapshotClass *klass) +static void gvir_config_domain_snapshot_class_init(GVirConfigDomainSnapshotClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSnapshotPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-sound.c b/libvirt-gconfig/libvirt-gconfig-domain-sound.c index 7ce71bd..937143c 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-sound.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-sound.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainSoundPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSound, gvir_config_domain_sound, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSound, gvir_config_domain_sound, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_sound_class_init(GVirConfigDomainSoundClass *klass) +static void gvir_config_domain_sound_class_init(GVirConfigDomainSoundClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSoundPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c b/libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c index ba74a28..ba24cb9 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainTimerHpetPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainTimerHpet, gvir_config_domain_timer_hpet, GVIR_CONFIG_TYPE_DOMAIN_TIMER); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainTimerHpet, gvir_config_domain_timer_hpet, GVIR_CONFIG_TYPE_DOMAIN_TIMER); -static void gvir_config_domain_timer_hpet_class_init(GVirConfigDomainTimerHpetClass *klass) +static void gvir_config_domain_timer_hpet_class_init(GVirConfigDomainTimerHpetClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainTimerHpetPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c b/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c index af979b2..1bc13b4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainTimerPitPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainTimerPit, gvir_config_domain_timer_pit, GVIR_CONFIG_TYPE_DOMAIN_TIMER); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainTimerPit, gvir_config_domain_timer_pit, GVIR_CONFIG_TYPE_DOMAIN_TIMER); -static void gvir_config_domain_timer_pit_class_init(GVirConfigDomainTimerPitClass *klass) +static void gvir_config_domain_timer_pit_class_init(GVirConfigDomainTimerPitClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainTimerPitPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c b/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c index 0adcc66..06a76c8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainTimerRtcPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainTimerRtc, gvir_config_domain_timer_rtc, GVIR_CONFIG_TYPE_DOMAIN_TIMER); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainTimerRtc, gvir_config_domain_timer_rtc, GVIR_CONFIG_TYPE_DOMAIN_TIMER); -static void gvir_config_domain_timer_rtc_class_init(GVirConfigDomainTimerRtcClass *klass) +static void gvir_config_domain_timer_rtc_class_init(GVirConfigDomainTimerRtcClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainTimerRtcPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer.c b/libvirt-gconfig/libvirt-gconfig-domain-timer.c index e89e111..f33a56f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer.c @@ -36,9 +36,8 @@ struct _GVirConfigDomainTimerPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainTimer, gvir_config_domain_timer, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_timer_class_init(GVirConfigDomainTimerClass *klass) +static void gvir_config_domain_timer_class_init(GVirConfigDomainTimerClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainTimerPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-video.c b/libvirt-gconfig/libvirt-gconfig-domain-video.c index ed11476..3a98cf0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-video.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-video.c @@ -34,12 +34,11 @@ struct _GVirConfigDomainVideoPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainVideo, gvir_config_domain_video, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainVideo, gvir_config_domain_video, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_video_class_init(GVirConfigDomainVideoClass *klass) +static void gvir_config_domain_video_class_init(GVirConfigDomainVideoClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainVideoPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index de84fd4..82f8516 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -34,7 +34,7 @@ struct _GVirConfigDomainPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomain, gvir_config_domain, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomain, gvir_config_domain, GVIR_CONFIG_TYPE_OBJECT); enum { PROP_0, @@ -128,7 +128,6 @@ static void gvir_config_domain_class_init(GVirConfigDomainClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); - g_type_class_add_private(klass, sizeof(GVirConfigDomainPrivate)); object_class->get_property = gvir_config_domain_get_property; object_class->set_property = gvir_config_domain_set_property; diff --git a/libvirt-gconfig/libvirt-gconfig-interface.c b/libvirt-gconfig/libvirt-gconfig-interface.c index 6c81325..dbf261a 100644 --- a/libvirt-gconfig/libvirt-gconfig-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-interface.c @@ -33,12 +33,11 @@ struct _GVirConfigInterfacePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigInterface, gvir_config_interface, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigInterface, gvir_config_interface, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_interface_class_init(GVirConfigInterfaceClass *klass) +static void gvir_config_interface_class_init(GVirConfigInterfaceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigInterfacePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-network-filter.c b/libvirt-gconfig/libvirt-gconfig-network-filter.c index eddf05c..b1b1476 100644 --- a/libvirt-gconfig/libvirt-gconfig-network-filter.c +++ b/libvirt-gconfig/libvirt-gconfig-network-filter.c @@ -33,12 +33,11 @@ struct _GVirConfigNetworkFilterPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigNetworkFilter, gvir_config_network_filter, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigNetworkFilter, gvir_config_network_filter, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_network_filter_class_init(GVirConfigNetworkFilterClass *klass) +static void gvir_config_network_filter_class_init(GVirConfigNetworkFilterClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigNetworkFilterPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-network.c b/libvirt-gconfig/libvirt-gconfig-network.c index 963d056..14e76bb 100644 --- a/libvirt-gconfig/libvirt-gconfig-network.c +++ b/libvirt-gconfig/libvirt-gconfig-network.c @@ -33,12 +33,11 @@ struct _GVirConfigNetworkPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigNetwork, gvir_config_network, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigNetwork, gvir_config_network, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_network_class_init(GVirConfigNetworkClass *klass) +static void gvir_config_network_class_init(GVirConfigNetworkClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigNetworkPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-node-device.c b/libvirt-gconfig/libvirt-gconfig-node-device.c index b89690f..40bd415 100644 --- a/libvirt-gconfig/libvirt-gconfig-node-device.c +++ b/libvirt-gconfig/libvirt-gconfig-node-device.c @@ -33,12 +33,11 @@ struct _GVirConfigNodeDevicePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigNodeDevice, gvir_config_node_device, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigNodeDevice, gvir_config_node_device, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_node_device_class_init(GVirConfigNodeDeviceClass *klass) +static void gvir_config_node_device_class_init(GVirConfigNodeDeviceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigNodeDevicePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index ca2c6e6..fffbd21 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -42,7 +42,7 @@ struct _GVirConfigObjectPrivate xmlNodePtr node; }; -G_DEFINE_TYPE(GVirConfigObject, gvir_config_object, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigObject, gvir_config_object, G_TYPE_OBJECT); enum { PROP_0, @@ -175,8 +175,6 @@ static void gvir_config_object_class_init(GVirConfigObjectClass *klass) G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - - g_type_class_add_private(klass, sizeof(GVirConfigObjectPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-secret.c b/libvirt-gconfig/libvirt-gconfig-secret.c index 73a3fc3..5bdb53a 100644 --- a/libvirt-gconfig/libvirt-gconfig-secret.c +++ b/libvirt-gconfig/libvirt-gconfig-secret.c @@ -33,12 +33,11 @@ struct _GVirConfigSecretPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigSecret, gvir_config_secret, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigSecret, gvir_config_secret, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_secret_class_init(GVirConfigSecretClass *klass) +static void gvir_config_secret_class_init(GVirConfigSecretClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigSecretPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-permissions.c b/libvirt-gconfig/libvirt-gconfig-storage-permissions.c index 79c3b9e..886c6de 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-permissions.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-permissions.c @@ -33,12 +33,11 @@ struct _GVirConfigStoragePermissionsPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStoragePermissions, gvir_config_storage_permissions, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStoragePermissions, gvir_config_storage_permissions, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_permissions_class_init(GVirConfigStoragePermissionsClass *klass) +static void gvir_config_storage_permissions_class_init(GVirConfigStoragePermissionsClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStoragePermissionsPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c b/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c index 07af50b..987b97d 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c @@ -34,12 +34,11 @@ struct _GVirConfigStoragePoolSourcePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStoragePoolSource, gvir_config_storage_pool_source, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStoragePoolSource, gvir_config_storage_pool_source, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_pool_source_class_init(GVirConfigStoragePoolSourceClass *klass) +static void gvir_config_storage_pool_source_class_init(GVirConfigStoragePoolSourceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStoragePoolSourcePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c b/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c index 72ea21d..a686479 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c @@ -34,12 +34,11 @@ struct _GVirConfigStoragePoolTargetPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStoragePoolTarget, gvir_config_storage_pool_target, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStoragePoolTarget, gvir_config_storage_pool_target, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_pool_target_class_init(GVirConfigStoragePoolTargetClass *klass) +static void gvir_config_storage_pool_target_class_init(GVirConfigStoragePoolTargetClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStoragePoolTargetPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.c b/libvirt-gconfig/libvirt-gconfig-storage-pool.c index 0c7940d..72cfa28 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.c @@ -35,12 +35,11 @@ struct _GVirConfigStoragePoolPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStoragePool, gvir_config_storage_pool, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStoragePool, gvir_config_storage_pool, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_pool_class_init(GVirConfigStoragePoolClass *klass) +static void gvir_config_storage_pool_class_init(GVirConfigStoragePoolClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStoragePoolPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c b/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c index 14a0e22..b574af0 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c @@ -34,12 +34,11 @@ struct _GVirConfigStorageVolBackingStorePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStorageVolBackingStore, gvir_config_storage_vol_backing_store, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStorageVolBackingStore, gvir_config_storage_vol_backing_store, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_vol_backing_store_class_init(GVirConfigStorageVolBackingStoreClass *klass) +static void gvir_config_storage_vol_backing_store_class_init(GVirConfigStorageVolBackingStoreClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStorageVolBackingStorePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c index cf4c0c7..751c950 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c @@ -34,12 +34,11 @@ struct _GVirConfigStorageVolTargetPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStorageVolTarget, gvir_config_storage_vol_target, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStorageVolTarget, gvir_config_storage_vol_target, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_vol_target_class_init(GVirConfigStorageVolTargetClass *klass) +static void gvir_config_storage_vol_target_class_init(GVirConfigStorageVolTargetClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStorageVolTargetPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol.c b/libvirt-gconfig/libvirt-gconfig-storage-vol.c index 2dade7e..76ac105 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol.c @@ -35,12 +35,11 @@ struct _GVirConfigStorageVolPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStorageVol, gvir_config_storage_vol, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStorageVol, gvir_config_storage_vol, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_vol_class_init(GVirConfigStorageVolClass *klass) +static void gvir_config_storage_vol_class_init(GVirConfigStorageVolClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStorageVolPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-xml-doc.c b/libvirt-gconfig/libvirt-gconfig-xml-doc.c index d17da21..fd461d7 100644 --- a/libvirt-gconfig/libvirt-gconfig-xml-doc.c +++ b/libvirt-gconfig/libvirt-gconfig-xml-doc.c @@ -37,7 +37,7 @@ struct _GVirConfigXmlDocPrivate xmlDocPtr doc; }; -G_DEFINE_TYPE(GVirConfigXmlDoc, gvir_config_xml_doc, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigXmlDoc, gvir_config_xml_doc, G_TYPE_OBJECT); enum { PROP_0, @@ -90,7 +90,6 @@ static void gvir_config_xml_doc_class_init(GVirConfigXmlDocClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); - g_type_class_add_private(klass, sizeof(GVirConfigXmlDocPrivate)); object_class->finalize = gvir_config_xml_doc_finalize; object_class->get_property = gvir_config_xml_doc_get_property; diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 3f17265..b8f88b3 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -48,7 +48,7 @@ struct _GVirConnectionPrivate GHashTable *networks; }; -G_DEFINE_TYPE(GVirConnection, gvir_connection, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConnection, gvir_connection, G_TYPE_OBJECT); enum { @@ -231,7 +231,6 @@ static void gvir_connection_class_init(GVirConnectionClass *klass) 1, GVIR_TYPE_DOMAIN); - g_type_class_add_private(klass, sizeof(GVirConnectionPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-domain-device.c b/libvirt-gobject/libvirt-gobject-domain-device.c index 8986e44..c113941 100644 --- a/libvirt-gobject/libvirt-gobject-domain-device.c +++ b/libvirt-gobject/libvirt-gobject-domain-device.c @@ -135,7 +135,6 @@ static void gvir_domain_device_class_init(GVirDomainDeviceClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirDomainDevicePrivate)); } static void gvir_domain_device_init(GVirDomainDevice *self) diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index bb2a682..f0cb848 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -39,7 +39,7 @@ struct _GVirDomainDiskPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirDomainDisk, gvir_domain_disk, GVIR_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirDomainDisk, gvir_domain_disk, GVIR_TYPE_DOMAIN_DEVICE); #define GVIR_DOMAIN_DISK_ERROR gvir_domain_disk_error_quark() @@ -49,9 +49,8 @@ gvir_domain_disk_error_quark(void) return g_quark_from_static_string("gvir-domain-disk"); } -static void gvir_domain_disk_class_init(GVirDomainDiskClass *klass) +static void gvir_domain_disk_class_init(GVirDomainDiskClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirDomainDiskPrivate)); } static void gvir_domain_disk_init(GVirDomainDisk *self) diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index beae11e..f58d088 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -39,7 +39,7 @@ struct _GVirDomainInterfacePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirDomainInterface, gvir_domain_interface, GVIR_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirDomainInterface, gvir_domain_interface, GVIR_TYPE_DOMAIN_DEVICE); #define GVIR_DOMAIN_INTERFACE_ERROR gvir_domain_interface_error_quark() @@ -49,9 +49,8 @@ gvir_domain_interface_error_quark(void) return g_quark_from_static_string("gvir-domain-interface"); } -static void gvir_domain_interface_class_init(GVirDomainInterfaceClass *klass) +static void gvir_domain_interface_class_init(GVirDomainInterfaceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirDomainInterfacePrivate)); } static void gvir_domain_interface_init(GVirDomainInterface *self) diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index 2a4338b..decdc68 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -38,7 +38,7 @@ struct _GVirDomainSnapshotPrivate virDomainSnapshotPtr handle; }; -G_DEFINE_TYPE(GVirDomainSnapshot, gvir_domain_snapshot, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirDomainSnapshot, gvir_domain_snapshot, G_TYPE_OBJECT); enum { @@ -126,7 +126,6 @@ static void gvir_domain_snapshot_class_init(GVirDomainSnapshotClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirDomainSnapshotPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 7be936d..b522ff0 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -46,7 +46,7 @@ struct _GVirDomainPrivate GMutex *lock; }; -G_DEFINE_TYPE(GVirDomain, gvir_domain, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirDomain, gvir_domain, G_TYPE_OBJECT); enum { @@ -247,7 +247,6 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_TYPE_NONE, 0); - g_type_class_add_private(klass, sizeof(GVirDomainPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-input-stream.c b/libvirt-gobject/libvirt-gobject-input-stream.c index 788e16e..2df975c 100644 --- a/libvirt-gobject/libvirt-gobject-input-stream.c +++ b/libvirt-gobject/libvirt-gobject-input-stream.c @@ -31,9 +31,6 @@ #include "libvirt-gobject-input-stream.h" #include "libvirt-gobject-compat.h" -#define gvir_input_stream_get_type _gvir_input_stream_get_type -G_DEFINE_TYPE(GVirInputStream, gvir_input_stream, G_TYPE_INPUT_STREAM); - enum { PROP_0, @@ -50,6 +47,9 @@ struct _GVirInputStreamPrivate gsize count; }; +#define gvir_input_stream_get_type _gvir_input_stream_get_type +G_DEFINE_TYPE_WITH_PRIVATE(GVirInputStream, gvir_input_stream, G_TYPE_INPUT_STREAM); + static void gvir_input_stream_get_property(GObject *object, guint prop_id, GValue *value, @@ -196,7 +196,6 @@ static void gvir_input_stream_class_init(GVirInputStreamClass *klass) GObjectClass *gobject_class = G_OBJECT_CLASS(klass); GInputStreamClass *ginputstream_class = G_INPUT_STREAM_CLASS(klass); - g_type_class_add_private(klass, sizeof(GVirInputStreamPrivate)); gobject_class->finalize = gvir_input_stream_finalize; gobject_class->get_property = gvir_input_stream_get_property; diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index ed7421f..1bd75bd 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -38,7 +38,7 @@ struct _GVirInterfacePrivate virInterfacePtr handle; }; -G_DEFINE_TYPE(GVirInterface, gvir_interface, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirInterface, gvir_interface, G_TYPE_OBJECT); enum { @@ -126,7 +126,6 @@ static void gvir_interface_class_init(GVirInterfaceClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirInterfacePrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index bbd5f84..023df53 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -39,7 +39,7 @@ struct _GVirManagerPrivate GList *connections; }; -G_DEFINE_TYPE(GVirManager, gvir_manager, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirManager, gvir_manager, G_TYPE_OBJECT); enum { @@ -102,7 +102,6 @@ static void gvir_manager_class_init(GVirManagerClass *klass) 1, GVIR_TYPE_CONNECTION); - g_type_class_add_private(klass, sizeof(GVirManagerPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c b/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c index 200778d..6bed50c 100644 --- a/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c +++ b/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c @@ -46,7 +46,7 @@ struct _GVirNetworkDHCPLeasePrivate #endif /* HAVE_VIR_NETWORK_GET_DHCP_LEASES */ }; -G_DEFINE_TYPE(GVirNetworkDHCPLease, gvir_network_dhcp_lease, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirNetworkDHCPLease, gvir_network_dhcp_lease, G_TYPE_OBJECT); enum { PROP_0, @@ -124,7 +124,6 @@ static void gvir_network_dhcp_lease_class_init(GVirNetworkDHCPLeaseClass *klass) G_PARAM_PRIVATE | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirNetworkDHCPLeasePrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index 7c5d6c0..d63d48a 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -39,7 +39,7 @@ struct _GVirNetworkFilterPrivate gchar uuid[VIR_UUID_STRING_BUFLEN]; }; -G_DEFINE_TYPE(GVirNetworkFilter, gvir_network_filter, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirNetworkFilter, gvir_network_filter, G_TYPE_OBJECT); enum { @@ -142,7 +142,6 @@ static void gvir_network_filter_class_init(GVirNetworkFilterClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirNetworkFilterPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 0129a73..b607cf8 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -42,7 +42,7 @@ struct _GVirNetworkPrivate gchar uuid[VIR_UUID_STRING_BUFLEN]; }; -G_DEFINE_TYPE(GVirNetwork, gvir_network, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirNetwork, gvir_network, G_TYPE_OBJECT); enum { @@ -142,7 +142,6 @@ static void gvir_network_class_init(GVirNetworkClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirNetworkPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index b7b7c9e..ecc448c 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -38,7 +38,7 @@ struct _GVirNodeDevicePrivate virNodeDevicePtr handle; }; -G_DEFINE_TYPE(GVirNodeDevice, gvir_node_device, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirNodeDevice, gvir_node_device, G_TYPE_OBJECT); enum { @@ -126,7 +126,6 @@ static void gvir_node_device_class_init(GVirNodeDeviceClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirNodeDevicePrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-output-stream.c b/libvirt-gobject/libvirt-gobject-output-stream.c index 97feb80..6869b4d 100644 --- a/libvirt-gobject/libvirt-gobject-output-stream.c +++ b/libvirt-gobject/libvirt-gobject-output-stream.c @@ -31,9 +31,6 @@ #include "libvirt-gobject-output-stream.h" #include "libvirt-gobject-compat.h" -#define gvir_output_stream_get_type _gvir_output_stream_get_type -G_DEFINE_TYPE(GVirOutputStream, gvir_output_stream, G_TYPE_OUTPUT_STREAM); - enum { PROP_0, @@ -50,6 +47,9 @@ struct _GVirOutputStreamPrivate gsize count; }; +#define gvir_output_stream_get_type _gvir_output_stream_get_type +G_DEFINE_TYPE_WITH_PRIVATE(GVirOutputStream, gvir_output_stream, G_TYPE_OUTPUT_STREAM); + static void gvir_output_stream_get_property(GObject *object, guint prop_id, GValue *value, @@ -196,7 +196,6 @@ static void gvir_output_stream_class_init(GVirOutputStreamClass *klass) GObjectClass *gobject_class = G_OBJECT_CLASS(klass); GOutputStreamClass *goutputstream_class = G_OUTPUT_STREAM_CLASS(klass); - g_type_class_add_private(klass, sizeof(GVirOutputStreamPrivate)); gobject_class->finalize = gvir_output_stream_finalize; gobject_class->get_property = gvir_output_stream_get_property; diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index bf15931..81f72b8 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -39,7 +39,7 @@ struct _GVirSecretPrivate gchar uuid[VIR_UUID_STRING_BUFLEN]; }; -G_DEFINE_TYPE(GVirSecret, gvir_secret, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSecret, gvir_secret, G_TYPE_OBJECT); enum { @@ -141,7 +141,6 @@ static void gvir_secret_class_init(GVirSecretClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirSecretPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 227bf23..175b6f0 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -43,7 +43,7 @@ struct _GVirStoragePoolPrivate gchar uuid[VIR_UUID_STRING_BUFLEN]; }; -G_DEFINE_TYPE(GVirStoragePool, gvir_storage_pool, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirStoragePool, gvir_storage_pool, G_TYPE_OBJECT); enum { @@ -153,7 +153,6 @@ static void gvir_storage_pool_class_init(GVirStoragePoolClass *klass) G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirStoragePoolPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 18aa8b3..2a9c67f 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -41,7 +41,7 @@ struct _GVirStorageVolPrivate GVirStoragePool *pool; }; -G_DEFINE_TYPE(GVirStorageVol, gvir_storage_vol, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirStorageVol, gvir_storage_vol, G_TYPE_OBJECT); enum { @@ -148,7 +148,6 @@ static void gvir_storage_vol_class_init(GVirStorageVolClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirStorageVolPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index a518a19..c175353 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -58,7 +58,7 @@ typedef struct { } GVirStreamSource; -G_DEFINE_TYPE(GVirStream, gvir_stream, G_TYPE_IO_STREAM); +G_DEFINE_TYPE_WITH_PRIVATE(GVirStream, gvir_stream, G_TYPE_IO_STREAM); enum { @@ -279,7 +279,6 @@ static void gvir_stream_class_init(GVirStreamClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirStreamPrivate)); } -- 2.16.4

2 2

[libvirt] [PATCH v2 0/5] Extend apparmor rules for libvirt 4.6
by Christian Ehrhardt 16 Aug '18

16 Aug '18

Hi, this is a summary of things I had to touch recently for libvirt 4.6. The first two patches are re-submissions and modifications of last year which were never totally challenged, but also not pushed. The first was lost in a discussion about virt-aa-helper, whicih eventually turned out to be clear that it could not help in that case. - https://www.redhat.com/archives/libvir-list/2017-February/msg01598.html - https://www.redhat.com/archives/libvir-list/2017-March/msg00052.html The second even got a few Acks, but neither made it into upstream yet. Parts of it where introduced already, in 7edcbd02 apparmor: allow libvirt to send term signal to unconfined b482925c apparmor: support ptrace checks But there are still signals blocked with those rules, so I resubmit the remaining bit. Also I added the Acks to the resubmission. The third&fourth change came in recently via various bug reports which I finally wanted to adress - e.g. for ceph lib or smb. If we later on spot more cases that have predictable safe paths under /tmp we can add those. Finally the fifth change was triggered by me testing libvirt 4.6 in various conditions. Some of them were in containers, and the new libvirt behavior to carry more mount points into the qemu namespace triggers the need to rewrite the existing mount-moving rules that we added last year. *Updates in V2* - added Acks to path #1 - split former patch #3 into #3/#4 to discuss /tmp access and qemu-smd individually - rewrote reasoning and concerns as well as TODOs to improve later in regard to the /tmp related commits #3/#4 - Updated the rule since the trailing {,/} is not needed after ** Christian Ehrhardt (5): apparmor: allow openGraphicsFD for virt manager >1.4 apparmor: add mediation rules for unconfined guests apparmor: allow expected /tmp access patterns apparmor: allow qemu-smb access in /tmp apparmor: allow to preserve /dev mountpoints into qemu namespaces examples/apparmor/libvirt-qemu | 20 ++++++++++++++++++++ examples/apparmor/usr.sbin.libvirtd | 24 +++++++++++++----------- 2 files changed, 33 insertions(+), 11 deletions(-) -- 2.17.1

2 11

[libvirt] [PATCH] spec: Add firmware/nvram paths for edk2 arm and ia32
by Cole Robinson 16 Aug '18

16 Aug '18

And clarify the comments to instead mention the package names that provide these files Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 3edb60d2d2..f3d5c032af 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1132,14 +1132,22 @@ exit 1 %define arg_selinux_mount --with-selinux-mount="/sys/fs/selinux" %if 0%{?fedora} - # Nightly firmware repo x86/OVMF + # Nightly edk2.git-ovmf-x64 LOADERS="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd" - # Nightly firmware repo aarch64/AAVMF + # Nightly edk2.git-ovmf-ia32 + LOADERS="/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd" + # Nightly edk2.git-aarch64 LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw" - # Fedora official x86/OVMF + # Nightly edk2.git-arm + LOADERS="$LOADERS:/usr/share/edk2.git/arm/QEMU_EFI-pflash.raw:/usr/share/edk2.git/arm/vars-template-pflash.raw" + # Fedora edk2-ovmf LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd" - # Fedora official aarch64/AAVMF + # Fedora edk2-ovmf-ia32 + LOADERS="$LOADERS:/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd:/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd" + # Fedora edk2-aarch64 LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw" + # Fedora edk2-arm + LOADERS="$LOADERS:/usr/share/edk2/arm/QEMU_EFI-pflash.raw:/usr/share/edk2/arm/vars-template-pflash.raw" %define arg_loader_nvram --with-loader-nvram="$LOADERS" %endif -- 2.17.1

2 5

[libvirt] [PATCH] qemu_command: Fix memleak in qemuBuildFloppyCommandLineControllerOptions
by Michal Privoznik 16 Aug '18

16 Aug '18

Even though the buffer is passed to virCommand we still need to free it. ==191201== 1,010 bytes in 1 blocks are definitely lost in loss record 826 of 836 ==191201== at 0x4C2CE3F: malloc (vg_replace_malloc.c:298) ==191201== by 0x4C2F1BF: realloc (vg_replace_malloc.c:785) ==191201== by 0x5D39E82: virReallocN (viralloc.c:245) ==191201== by 0x5D3E8F2: virBufferGrow (virbuffer.c:150) ==191201== by 0x5D3E9C8: virBufferAdd (virbuffer.c:185) ==191201== by 0x56EAC98: qemuBuildFloppyCommandLineControllerOptions (qemu_command.c:2162) ==191201== by 0x56EB3E1: qemuBuildDisksCommandLine (qemu_command.c:2370) ==191201== by 0x570055E: qemuBuildCommandLine (qemu_command.c:10315) ==191201== by 0x575EA7F: qemuProcessCreatePretendCmd (qemu_process.c:6777) ==191201== by 0x113DAB: testCompareXMLToArgv (qemuxml2argvtest.c:598) ==191201== by 0x13A75B: virTestRun (testutils.c:180) ==191201== by 0x138BE8: mymain (qemuxml2argvtest.c:2975) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ddb90895e0..96fc360f4a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2225,6 +2225,7 @@ qemuBuildFloppyCommandLineControllerOptions(virCommandPtr cmd, VIR_FREE(backendAlias); VIR_FREE(backendStr); VIR_FREE(bootindexStr); + virBufferFreeAndReset(&fdc_opts); return ret; } -- 2.16.4

3 2

[libvirt] [PATCH v2 0/6] fdaskljrew
by Simon Kobyda 16 Aug '18

16 Aug '18

rpdwrewrewr Simon Kobyda (6): vsh: Add API for printing tables. virsh: Implement new table API for virsh list vsh: Added tests virsh: Implement vsh-table to iface-list virsh: Implement vshTable API to net-list and net-dhcp-leases virsh: Implement vshTable API to secret-list tests/Makefile.am | 8 + tests/virshtest.c | 14 +- tests/vshtabletest.c | 247 +++++++++++++++++++++ tools/Makefile.am | 4 +- tools/virsh-domain-monitor.c | 43 ++-- tools/virsh-interface.c | 27 ++- tools/virsh-network.c | 50 +++-- tools/virsh-secret.c | 30 ++- tools/vsh-table.c | 413 +++++++++++++++++++++++++++++++++++ tools/vsh-table.h | 42 ++++ 10 files changed, 817 insertions(+), 61 deletions(-) create mode 100644 tests/vshtabletest.c create mode 100644 tools/vsh-table.c create mode 100644 tools/vsh-table.h -- 2.17.1

4 7

[libvirt] [PATCH 0/5] qemu: Get rid of QEMU_CAPS_ADD_FD
by Peter Krempa 16 Aug '18

16 Aug '18

The fallout was slightly larger than expected. Peter Krempa (5): tests: qemuxml2argvmock: Don't mock virCommandPassFD qemu: command: Extract opening of TPM backend FDs for mocking purposes tests: qemuxml2argv: modernize TPM passthrough tests qemu: capabilities: Always assume QEMU_CAPS_ADD_FD FIXUP: renumber replies lines after deleting section src/qemu/qemu_capabilities.c | 17 -- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 69 ++++--- src/qemu/qemu_command.h | 7 + .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 169 ++++++++-------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 169 ++++++++-------- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 169 ++++++++-------- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 169 ++++++++-------- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 3 +- .../caps_2.10.0.aarch64.replies | 169 ++++++++-------- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 169 ++++++++-------- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 169 ++++++++-------- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 3 +- .../caps_2.10.0.x86_64.replies | 201 +++++++++---------- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 173 ++++++++--------- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 +- .../caps_2.11.0.x86_64.replies | 201 +++++++++---------- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 3 +- .../caps_2.12.0.aarch64.replies | 177 ++++++++--------- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 177 ++++++++--------- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 181 ++++++++--------- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 +- .../caps_2.12.0.x86_64.replies | 213 ++++++++++----------- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 181 ++++++++--------- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 185 ++++++++---------- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 +- .../caps_2.6.0.aarch64.replies | 169 ++++++++-------- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 169 ++++++++-------- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 185 ++++++++---------- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 161 +++++++--------- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 185 ++++++++---------- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 169 ++++++++-------- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 185 ++++++++---------- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 169 ++++++++-------- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 169 ++++++++-------- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 201 +++++++++---------- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 177 ++++++++--------- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 213 ++++++++++----------- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 3 +- tests/qemuxml2argvdata/tpm-passthrough-crb.args | 5 +- tests/qemuxml2argvdata/tpm-passthrough.args | 5 +- tests/qemuxml2argvmock.c | 24 ++- 63 files changed, 2371 insertions(+), 2866 deletions(-) -- 2.16.2

3 12

[libvirt] [PATCH 0/4] cpu: modularize the CPU map data file
by Daniel P. Berrangé 16 Aug '18

16 Aug '18

Currently we have a cpu_map.xml file that contains all the features and CPU models for all architectures in one place. I frequently find myself wondering about the differences between CPU models, but it is hard to compare them as the list of features is huge. With this patch series we end up with a large set of small files, one per named CPU model, along with one for the feature and vendor definitions cpu_map_ppc64_POWER6.xml cpu_map_ppc64_POWER7.xml cpu_map_ppc64_POWER8.xml cpu_map_ppc64_POWER9.xml cpu_map_ppc64_POWERPC_e5500.xml cpu_map_ppc64_POWERPC_e6500.xml cpu_map_ppc64_vendors.xml cpu_map_x86_486.xml cpu_map_x86_athlon.xml cpu_map_x86_Broadwell-IBRS.xml cpu_map_x86_Broadwell-noTSX-IBRS.xml cpu_map_x86_Broadwell-noTSX.xml cpu_map_x86_Broadwell.xml cpu_map_x86_Conroe.xml cpu_map_x86_core2duo.xml cpu_map_x86_coreduo.xml cpu_map_x86_cpu64-rhel5.xml cpu_map_x86_cpu64-rhel6.xml cpu_map_x86_EPYC-IBRS.xml cpu_map_x86_EPYC.xml cpu_map_x86_features.xml cpu_map_x86_Haswell-IBRS.xml cpu_map_x86_Haswell-noTSX-IBRS.xml cpu_map_x86_Haswell-noTSX.xml cpu_map_x86_Haswell.xml cpu_map_x86_IvyBridge-IBRS.xml cpu_map_x86_IvyBridge.xml cpu_map_x86_kvm32.xml cpu_map_x86_kvm64.xml cpu_map_x86_n270.xml cpu_map_x86_Nehalem-IBRS.xml cpu_map_x86_Nehalem.xml cpu_map_x86_Opteron_G1.xml cpu_map_x86_Opteron_G2.xml cpu_map_x86_Opteron_G3.xml cpu_map_x86_Opteron_G4.xml cpu_map_x86_Opteron_G5.xml cpu_map_x86_Penryn.xml cpu_map_x86_pentium2.xml cpu_map_x86_pentium3.xml cpu_map_x86_pentiumpro.xml cpu_map_x86_pentium.xml cpu_map_x86_phenom.xml cpu_map_x86_qemu32.xml cpu_map_x86_qemu64.xml cpu_map_x86_SandyBridge-IBRS.xml cpu_map_x86_SandyBridge.xml cpu_map_x86_Skylake-Client-IBRS.xml cpu_map_x86_Skylake-Client.xml cpu_map_x86_Skylake-Server-IBRS.xml cpu_map_x86_Skylake-Server.xml cpu_map_x86_vendors.xml cpu_map_x86_Westmere-IBRS.xml cpu_map_x86_Westmere.xml The main cpu_map.xml file is now just a list of <include filename="XXX"/> statements to pull in the individual files Now we can easily see the differences in each model: $ diff cpu_map_x86_Broadwell.xml cpu_map_x86_Skylake-Client.xml 2,3c2,3 < <model name='Broadwell'> < <signature family='6' model='61'/> --- > <model name='Skylake-Client'> > <signature family='6' model='94'/> 5a6 > <feature name='abm'/> 8a10 > <feature name='arat'/> 18a21 > <feature name='f16c'/> 30a34 > <feature name='mpx'/> 42a47 > <feature name='rdrand'/> 56a62 > <feature name='vme'/> 57a64 > <feature name='xgetbv1'/> 58a66,67 > <feature name='xsavec'/> > <feature name='xsaveopt'/> Daniel P. Berrangé (4): cpu: allow include files for CPU definition cpu: push more parsing logic into common code cpu: split PPC64 map data into separate files cpu: split x86 map data into separate files libvirt.spec.in | 2 +- mingw-libvirt.spec.in | 4 +- src/Makefile.am | 2 +- src/cpu/cpu_map.c | 160 +- src/cpu/cpu_map.h | 22 +- src/cpu/cpu_map.xml | 2415 +----------------- src/cpu/cpu_map_ppc64_POWER6.xml | 6 + src/cpu/cpu_map_ppc64_POWER7.xml | 7 + src/cpu/cpu_map_ppc64_POWER8.xml | 8 + src/cpu/cpu_map_ppc64_POWER9.xml | 6 + src/cpu/cpu_map_ppc64_POWERPC_e5500.xml | 6 + src/cpu/cpu_map_ppc64_POWERPC_e6500.xml | 6 + src/cpu/cpu_map_ppc64_vendors.xml | 4 + src/cpu/cpu_map_x86_486.xml | 7 + src/cpu/cpu_map_x86_Broadwell-IBRS.xml | 61 + src/cpu/cpu_map_x86_Broadwell-noTSX-IBRS.xml | 59 + src/cpu/cpu_map_x86_Broadwell-noTSX.xml | 58 + src/cpu/cpu_map_x86_Broadwell.xml | 60 + src/cpu/cpu_map_x86_Conroe.xml | 33 + src/cpu/cpu_map_x86_EPYC-IBRS.xml | 73 + src/cpu/cpu_map_x86_EPYC.xml | 72 + src/cpu/cpu_map_x86_Haswell-IBRS.xml | 57 + src/cpu/cpu_map_x86_Haswell-noTSX-IBRS.xml | 55 + src/cpu/cpu_map_x86_Haswell-noTSX.xml | 54 + src/cpu/cpu_map_x86_Haswell.xml | 56 + src/cpu/cpu_map_x86_IvyBridge-IBRS.xml | 51 + src/cpu/cpu_map_x86_IvyBridge.xml | 50 + src/cpu/cpu_map_x86_Nehalem-IBRS.xml | 38 + src/cpu/cpu_map_x86_Nehalem.xml | 37 + src/cpu/cpu_map_x86_Opteron_G1.xml | 31 + src/cpu/cpu_map_x86_Opteron_G2.xml | 35 + src/cpu/cpu_map_x86_Opteron_G3.xml | 40 + src/cpu/cpu_map_x86_Opteron_G4.xml | 50 + src/cpu/cpu_map_x86_Opteron_G5.xml | 53 + src/cpu/cpu_map_x86_Penryn.xml | 35 + src/cpu/cpu_map_x86_SandyBridge-IBRS.xml | 45 + src/cpu/cpu_map_x86_SandyBridge.xml | 44 + src/cpu/cpu_map_x86_Skylake-Client-IBRS.xml | 70 + src/cpu/cpu_map_x86_Skylake-Client.xml | 69 + src/cpu/cpu_map_x86_Skylake-Server-IBRS.xml | 77 + src/cpu/cpu_map_x86_Skylake-Server.xml | 76 + src/cpu/cpu_map_x86_Westmere-IBRS.xml | 39 + src/cpu/cpu_map_x86_Westmere.xml | 38 + src/cpu/cpu_map_x86_athlon.xml | 28 + src/cpu/cpu_map_x86_core2duo.xml | 33 + src/cpu/cpu_map_x86_coreduo.xml | 29 + src/cpu/cpu_map_x86_cpu64-rhel5.xml | 29 + src/cpu/cpu_map_x86_cpu64-rhel6.xml | 31 + src/cpu/cpu_map_x86_features.xml | 440 ++++ src/cpu/cpu_map_x86_kvm32.xml | 26 + src/cpu/cpu_map_x86_kvm64.xml | 30 + src/cpu/cpu_map_x86_n270.xml | 30 + src/cpu/cpu_map_x86_pentium.xml | 13 + src/cpu/cpu_map_x86_pentium2.xml | 22 + src/cpu/cpu_map_x86_pentium3.xml | 23 + src/cpu/cpu_map_x86_pentiumpro.xml | 21 + src/cpu/cpu_map_x86_phenom.xml | 36 + src/cpu/cpu_map_x86_qemu32.xml | 22 + src/cpu/cpu_map_x86_qemu64.xml | 40 + src/cpu/cpu_map_x86_vendors.xml | 4 + src/cpu/cpu_ppc64.c | 112 +- src/cpu/cpu_x86.c | 196 +- 62 files changed, 2703 insertions(+), 2633 deletions(-) create mode 100644 src/cpu/cpu_map_ppc64_POWER6.xml create mode 100644 src/cpu/cpu_map_ppc64_POWER7.xml create mode 100644 src/cpu/cpu_map_ppc64_POWER8.xml create mode 100644 src/cpu/cpu_map_ppc64_POWER9.xml create mode 100644 src/cpu/cpu_map_ppc64_POWERPC_e5500.xml create mode 100644 src/cpu/cpu_map_ppc64_POWERPC_e6500.xml create mode 100644 src/cpu/cpu_map_ppc64_vendors.xml create mode 100644 src/cpu/cpu_map_x86_486.xml create mode 100644 src/cpu/cpu_map_x86_Broadwell-IBRS.xml create mode 100644 src/cpu/cpu_map_x86_Broadwell-noTSX-IBRS.xml create mode 100644 src/cpu/cpu_map_x86_Broadwell-noTSX.xml create mode 100644 src/cpu/cpu_map_x86_Broadwell.xml create mode 100644 src/cpu/cpu_map_x86_Conroe.xml create mode 100644 src/cpu/cpu_map_x86_EPYC-IBRS.xml create mode 100644 src/cpu/cpu_map_x86_EPYC.xml create mode 100644 src/cpu/cpu_map_x86_Haswell-IBRS.xml create mode 100644 src/cpu/cpu_map_x86_Haswell-noTSX-IBRS.xml create mode 100644 src/cpu/cpu_map_x86_Haswell-noTSX.xml create mode 100644 src/cpu/cpu_map_x86_Haswell.xml create mode 100644 src/cpu/cpu_map_x86_IvyBridge-IBRS.xml create mode 100644 src/cpu/cpu_map_x86_IvyBridge.xml create mode 100644 src/cpu/cpu_map_x86_Nehalem-IBRS.xml create mode 100644 src/cpu/cpu_map_x86_Nehalem.xml create mode 100644 src/cpu/cpu_map_x86_Opteron_G1.xml create mode 100644 src/cpu/cpu_map_x86_Opteron_G2.xml create mode 100644 src/cpu/cpu_map_x86_Opteron_G3.xml create mode 100644 src/cpu/cpu_map_x86_Opteron_G4.xml create mode 100644 src/cpu/cpu_map_x86_Opteron_G5.xml create mode 100644 src/cpu/cpu_map_x86_Penryn.xml create mode 100644 src/cpu/cpu_map_x86_SandyBridge-IBRS.xml create mode 100644 src/cpu/cpu_map_x86_SandyBridge.xml create mode 100644 src/cpu/cpu_map_x86_Skylake-Client-IBRS.xml create mode 100644 src/cpu/cpu_map_x86_Skylake-Client.xml create mode 100644 src/cpu/cpu_map_x86_Skylake-Server-IBRS.xml create mode 100644 src/cpu/cpu_map_x86_Skylake-Server.xml create mode 100644 src/cpu/cpu_map_x86_Westmere-IBRS.xml create mode 100644 src/cpu/cpu_map_x86_Westmere.xml create mode 100644 src/cpu/cpu_map_x86_athlon.xml create mode 100644 src/cpu/cpu_map_x86_core2duo.xml create mode 100644 src/cpu/cpu_map_x86_coreduo.xml create mode 100644 src/cpu/cpu_map_x86_cpu64-rhel5.xml create mode 100644 src/cpu/cpu_map_x86_cpu64-rhel6.xml create mode 100644 src/cpu/cpu_map_x86_features.xml create mode 100644 src/cpu/cpu_map_x86_kvm32.xml create mode 100644 src/cpu/cpu_map_x86_kvm64.xml create mode 100644 src/cpu/cpu_map_x86_n270.xml create mode 100644 src/cpu/cpu_map_x86_pentium.xml create mode 100644 src/cpu/cpu_map_x86_pentium2.xml create mode 100644 src/cpu/cpu_map_x86_pentium3.xml create mode 100644 src/cpu/cpu_map_x86_pentiumpro.xml create mode 100644 src/cpu/cpu_map_x86_phenom.xml create mode 100644 src/cpu/cpu_map_x86_qemu32.xml create mode 100644 src/cpu/cpu_map_x86_qemu64.xml create mode 100644 src/cpu/cpu_map_x86_vendors.xml -- 2.17.1

3 15

[libvirt] [PATCH] spec: Add firmware/nvram paths for edk2 arm and ia32
by Cole Robinson 15 Aug '18

15 Aug '18

And clarify the comments to instead mention the package names that provide these files Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 3edb60d2d2..f3d5c032af 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1132,14 +1132,22 @@ exit 1 %define arg_selinux_mount --with-selinux-mount="/sys/fs/selinux" %if 0%{?fedora} - # Nightly firmware repo x86/OVMF + # Nightly edk2.git-ovmf-x64 LOADERS="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd" - # Nightly firmware repo aarch64/AAVMF + # Nightly edk2.git-ovmf-ia32 + LOADERS="/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd" + # Nightly edk2.git-aarch64 LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw" - # Fedora official x86/OVMF + # Nightly edk2.git-arm + LOADERS="$LOADERS:/usr/share/edk2.git/arm/QEMU_EFI-pflash.raw:/usr/share/edk2.git/arm/vars-template-pflash.raw" + # Fedora edk2-ovmf LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd" - # Fedora official aarch64/AAVMF + # Fedora edk2-ovmf-ia32 + LOADERS="$LOADERS:/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd:/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd" + # Fedora edk2-aarch64 LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw" + # Fedora edk2-arm + LOADERS="$LOADERS:/usr/share/edk2/arm/QEMU_EFI-pflash.raw:/usr/share/edk2/arm/vars-template-pflash.raw" %define arg_loader_nvram --with-loader-nvram="$LOADERS" %endif -- 2.17.1

2 2

[libvirt] Investigation and possible fix of 1361592 - apparmor profiles do not include backing files
by Povilas Kanapickas 15 Aug '18

15 Aug '18

Hi, I've looked into why apparmor profiles do not contain exceptions for backing files of images which later leads to permission errors due to apparmor containment. As of newest libvirt git master, only the first level backing image is included, the subsequent images are omitted. Below is my investigation of why this issue happens. It is based on libvirt git master as of 2018-08-15 (e3e48d7cb82d58). The possible fix is easy, but I don't have the background how to write tests for it, so it's best that someone who knows the project well completes the fix In my case I have the following file hierarchy: - image-master.qcow2 (has backing file image-backing-1.qcow2) - image-backing-1.qcow2 (has backing file image-backing-2.qcow2 - image-backing-2.qcow2 The apparmor profiles are created by the virt-aa-helper tool. The get_files function (src/security/virt-aa-helper.c:949) creates a list of files that need to be accessed by the virtual machine. The call to virDomainDiskDefForeachPath() is responsible for creating the list of files required to access each disk given the disk metadata. The disk->src argument contains the source file. The expected file hierarchy would be this: disk->src->path == path/to/image-master.qcow2 disk->src->backingStore->path == path/to/image-backing-1.qcow2 disk->src->backingStore->backingStore->path == path/to/image-backing-2.qcow2 Unfortunately only the first two levels are present and disk->src->backingStore->backingStore points to a dummy object. The backing store details are filled in virStorageFileGetMetadata() call. It calls into virStorageFileGetMetadataRecurse (src/util/virstoragefile.c:4789) which will collect metadata for a single image and recurse into itself for backing files. For us, the following part of virStorageFileGetMetadataRecurse is important (simplified for brevity): ``` virStorageFileGetMetadataInternal(src, ..., &backingFormat); if (src->backingStoreRaw) { backingStore = ... if (backingFormat == VIR_STORAGE_FILE_AUTO) backingStore->format = VIR_STORAGE_FILE_RAW; [1] else if (backingFormat == VIR_STORAGE_FILE_AUTO_SAFE) backingStore->format = VIR_STORAGE_FILE_AUTO; else backingStore->format = backingFormat; virStorageFileGetMetadataRecurse(backingStore, ...) [2] } ``` The crux of the issue seems that the call to virStorageFileGetMetadataInternal() for the image-master.qcow2 image will set the `backingFormat` return value to VIR_STORAGE_FILE_AUTO. The code responsible is in qcowXGetBackingStore (src/util/virstoragefile.c:491) called via `fileTypeInfo[meta->format].getBackingStore(...)` at src/util/virstoragefile.c:1042. It backingFormat is then downgraded to VIR_STORAGE_FILE_RAW at src/util/virstoragefile.c:4854 ([1] above). This causes the next recurse call to virStorageFileGetMetadataRecurse() ([2] above) to not investigate the backing images at all in virStorageFileGetMetadataInternal() as fileTypeInfo[VIR_STORAGE_FILE_RAW].getBackingStore will be NULL. The possible solution is to return VIR_STORAGE_FILE_AUTO_SAFE from qcowXGetBackingStore. It probably does not make much sense to prevent probing of qcow2 backing images as we probe the first level of backing images anyway, so that return value only affect second and subsequent levels of backing images. Looking into the implementation of qcowXGetBackingStore it also does not seem that it performs any operations that are unsafe by design. Currently VIR_STORAGE_FILE_AUTO is used only in qedGetBackingStore and it does not seem that probing of qcow images is unsafe enough What do the developers think about this? Could someone complete the fix with tests or advise me about the testing frameworks if there's not enough time? Thanks a lot! Povilas

1 0

[libvirt] [libvirt-glib][PATCH] Use new GObject define macros with private
by Michal Privoznik 15 Aug '18

15 Aug '18

G_ADD_PRIVATE was added in 2.38 and older functions are getting deprecated: https://gitlab.gnome.org/GNOME/glib/merge_requests/7/commits Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This was generated mostly using: sed -i "s/G_DEFINE_TYPE(/G_DEFINE_TYPE_WITH_PRIVATE(/ sed -i "/^\s\+g_type_class_add_private.*$/ d" and then adding G_GNUC_UNUSED wherever compiler complained. libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c | 3 +-- libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-guest.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities-host.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-capabilities.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-address-pci.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-address-usb.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-address.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-channel.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-chardev.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-clock.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-console.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-controller.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-cpu.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-device.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-graphics.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-hostdev-pci.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-hostdev.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-input.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c | 5 ++--- .../libvirt-gconfig-domain-interface-filterref-parameter.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-interface-network.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-interface-user.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-interface.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-memballoon.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-os.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-parallel.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-power-management.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-redirdev.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-seclabel.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-serial.c | 5 ++--- .../libvirt-gconfig-domain-smartcard-host-certificates.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-smartcard.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-snapshot.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-sound.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain-timer.c | 3 +-- libvirt-gconfig/libvirt-gconfig-domain-video.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-domain.c | 3 +-- libvirt-gconfig/libvirt-gconfig-interface.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-network-filter.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-network.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-node-device.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-object.c | 4 +--- libvirt-gconfig/libvirt-gconfig-secret.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-permissions.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-pool-source.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-pool-target.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-pool.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-vol-target.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-storage-vol.c | 5 ++--- libvirt-gconfig/libvirt-gconfig-xml-doc.c | 3 +-- libvirt-gobject/libvirt-gobject-connection.c | 3 +-- libvirt-gobject/libvirt-gobject-domain-device.c | 1 - libvirt-gobject/libvirt-gobject-domain-disk.c | 5 ++--- libvirt-gobject/libvirt-gobject-domain-interface.c | 5 ++--- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 3 +-- libvirt-gobject/libvirt-gobject-domain.c | 3 +-- libvirt-gobject/libvirt-gobject-input-stream.c | 7 +++---- libvirt-gobject/libvirt-gobject-interface.c | 3 +-- libvirt-gobject/libvirt-gobject-manager.c | 3 +-- libvirt-gobject/libvirt-gobject-network-dhcp-lease.c | 3 +-- libvirt-gobject/libvirt-gobject-network-filter.c | 3 +-- libvirt-gobject/libvirt-gobject-network.c | 3 +-- libvirt-gobject/libvirt-gobject-node-device.c | 3 +-- libvirt-gobject/libvirt-gobject-output-stream.c | 7 +++---- libvirt-gobject/libvirt-gobject-secret.c | 3 +-- libvirt-gobject/libvirt-gobject-storage-pool.c | 3 +-- libvirt-gobject/libvirt-gobject-storage-vol.c | 3 +-- libvirt-gobject/libvirt-gobject-stream.c | 3 +-- 99 files changed, 171 insertions(+), 271 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c index b52c0bf..3b0a47d 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-feature.c @@ -35,11 +35,10 @@ struct _GVirConfigCapabilitiesCpuFeaturePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesCpuFeature, gvir_config_capabilities_cpu_feature, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesCpuFeature, gvir_config_capabilities_cpu_feature, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_cpu_feature_class_init(GVirConfigCapabilitiesCpuFeatureClass *klass) +static void gvir_config_capabilities_cpu_feature_class_init(GVirConfigCapabilitiesCpuFeatureClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesCpuFeaturePrivate)); } static void gvir_config_capabilities_cpu_feature_init(GVirConfigCapabilitiesCpuFeature *feature) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c index 14630a0..21b6c18 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-model.c @@ -33,11 +33,10 @@ struct _GVirConfigCapabilitiesCpuModelPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesCpuModel, gvir_config_capabilities_cpu_model, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesCpuModel, gvir_config_capabilities_cpu_model, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_cpu_model_class_init(GVirConfigCapabilitiesCpuModelClass *klass) +static void gvir_config_capabilities_cpu_model_class_init(GVirConfigCapabilitiesCpuModelClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesCpuModelPrivate)); } static void gvir_config_capabilities_cpu_model_init(GVirConfigCapabilitiesCpuModel *model) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c index 1ff879a..f4edc5c 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-topology.c @@ -35,11 +35,10 @@ struct _GVirConfigCapabilitiesCpuTopologyPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesCpuTopology, gvir_config_capabilities_cpu_topology, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesCpuTopology, gvir_config_capabilities_cpu_topology, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_cpu_topology_class_init(GVirConfigCapabilitiesCpuTopologyClass *klass) +static void gvir_config_capabilities_cpu_topology_class_init(GVirConfigCapabilitiesCpuTopologyClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesCpuTopologyPrivate)); } static void gvir_config_capabilities_cpu_topology_init(GVirConfigCapabilitiesCpuTopology *topology) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c index 913c759..1056bbd 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c @@ -35,14 +35,13 @@ struct _GVirConfigCapabilitiesCpuPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesCpu, gvir_config_capabilities_cpu, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesCpu, gvir_config_capabilities_cpu, GVIR_CONFIG_TYPE_OBJECT); static GList * _gvir_config_capabilities_cpu_get_features(GVirConfigCapabilitiesCpu *cpu); static void gvir_config_capabilities_cpu_class_init(GVirConfigCapabilitiesCpuClass *klass) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesCpuPrivate)); klass->get_features = _gvir_config_capabilities_cpu_get_features; } diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c index 8da33dc..70c2885 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-arch.c @@ -35,11 +35,10 @@ struct _GVirConfigCapabilitiesGuestArchPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesGuestArch, gvir_config_capabilities_guest_arch, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesGuestArch, gvir_config_capabilities_guest_arch, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_guest_arch_class_init(GVirConfigCapabilitiesGuestArchClass *klass) +static void gvir_config_capabilities_guest_arch_class_init(GVirConfigCapabilitiesGuestArchClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesGuestArchPrivate)); } static void gvir_config_capabilities_guest_arch_init(GVirConfigCapabilitiesGuestArch *arch) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c index 3162ea1..5e438b1 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.c @@ -35,12 +35,11 @@ struct _GVirConfigCapabilitiesGuestDomainPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesGuestDomain, gvir_config_capabilities_guest_domain, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesGuestDomain, gvir_config_capabilities_guest_domain, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_guest_domain_class_init(GVirConfigCapabilitiesGuestDomainClass *klass) +static void gvir_config_capabilities_guest_domain_class_init(GVirConfigCapabilitiesGuestDomainClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesGuestDomainPrivate)); } static void gvir_config_capabilities_guest_domain_init(GVirConfigCapabilitiesGuestDomain *domain) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c index 9e9533a..036f38b 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.c @@ -35,11 +35,10 @@ struct _GVirConfigCapabilitiesGuestFeaturePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesGuestFeature, gvir_config_capabilities_guest_feature, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesGuestFeature, gvir_config_capabilities_guest_feature, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_guest_feature_class_init(GVirConfigCapabilitiesGuestFeatureClass *klass) +static void gvir_config_capabilities_guest_feature_class_init(GVirConfigCapabilitiesGuestFeatureClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesGuestFeaturePrivate)); } static void gvir_config_capabilities_guest_feature_init(GVirConfigCapabilitiesGuestFeature *feature) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-guest.c b/libvirt-gconfig/libvirt-gconfig-capabilities-guest.c index 128b22f..4d4e499 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-guest.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-guest.c @@ -35,12 +35,11 @@ struct _GVirConfigCapabilitiesGuestPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesGuest, gvir_config_capabilities_guest, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesGuest, gvir_config_capabilities_guest, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_guest_class_init(GVirConfigCapabilitiesGuestClass *klass) +static void gvir_config_capabilities_guest_class_init(GVirConfigCapabilitiesGuestClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesGuestPrivate)); } static void gvir_config_capabilities_guest_init(GVirConfigCapabilitiesGuest *guest) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c b/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c index 77e0593..2f76db2 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c @@ -33,11 +33,10 @@ struct _GVirConfigCapabilitiesHostSecModelPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesHostSecModel, gvir_config_capabilities_host_secmodel, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesHostSecModel, gvir_config_capabilities_host_secmodel, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_host_secmodel_class_init(GVirConfigCapabilitiesHostSecModelClass *klass) +static void gvir_config_capabilities_host_secmodel_class_init(GVirConfigCapabilitiesHostSecModelClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesHostSecModelPrivate)); } static void gvir_config_capabilities_host_secmodel_init(GVirConfigCapabilitiesHostSecModel *secmodel) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-host.c b/libvirt-gconfig/libvirt-gconfig-capabilities-host.c index e26c2d0..30a574e 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-host.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-host.c @@ -35,12 +35,11 @@ struct _GVirConfigCapabilitiesHostPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilitiesHost, gvir_config_capabilities_host, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilitiesHost, gvir_config_capabilities_host, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_host_class_init(GVirConfigCapabilitiesHostClass *klass) +static void gvir_config_capabilities_host_class_init(GVirConfigCapabilitiesHostClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesHostPrivate)); } static void gvir_config_capabilities_host_init(GVirConfigCapabilitiesHost *host) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities.c b/libvirt-gconfig/libvirt-gconfig-capabilities.c index 6cc5256..2b24696 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities.c @@ -34,12 +34,11 @@ struct _GVirConfigCapabilitiesPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigCapabilities, gvir_config_capabilities, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigCapabilities, gvir_config_capabilities, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_capabilities_class_init(GVirConfigCapabilitiesClass *klass) +static void gvir_config_capabilities_class_init(GVirConfigCapabilitiesClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c b/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c index 0105402..6b19702 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainAddressPciPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainAddressPci, gvir_config_domain_address_pci, GVIR_CONFIG_TYPE_DOMAIN_ADDRESS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainAddressPci, gvir_config_domain_address_pci, GVIR_CONFIG_TYPE_DOMAIN_ADDRESS); -static void gvir_config_domain_address_pci_class_init(GVirConfigDomainAddressPciClass *klass) +static void gvir_config_domain_address_pci_class_init(GVirConfigDomainAddressPciClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainAddressPciPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c b/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c index a794922..8f31757 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainAddressUsbPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainAddressUsb, gvir_config_domain_address_usb, GVIR_CONFIG_TYPE_DOMAIN_ADDRESS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainAddressUsb, gvir_config_domain_address_usb, GVIR_CONFIG_TYPE_DOMAIN_ADDRESS); -static void gvir_config_domain_address_usb_class_init(GVirConfigDomainAddressUsbClass *klass) +static void gvir_config_domain_address_usb_class_init(GVirConfigDomainAddressUsbClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainAddressUsbPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address.c b/libvirt-gconfig/libvirt-gconfig-domain-address.c index c0f6ba6..b070a1f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address.c @@ -36,9 +36,8 @@ struct _GVirConfigDomainAddressPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainAddress, gvir_config_domain_address, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_address_class_init(GVirConfigDomainAddressClass *klass) +static void gvir_config_domain_address_class_init(GVirConfigDomainAddressClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainAddressPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-channel.c b/libvirt-gconfig/libvirt-gconfig-domain-channel.c index 20e79e3..3e820dd 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-channel.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-channel.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainChannelPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainChannel, gvir_config_domain_channel, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainChannel, gvir_config_domain_channel, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); -static void gvir_config_domain_channel_class_init(GVirConfigDomainChannelClass *klass) +static void gvir_config_domain_channel_class_init(GVirConfigDomainChannelClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChannelPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c index c9fadc8..4ccd430 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c @@ -34,12 +34,11 @@ struct _GVirConfigDomainChardevSourcePtyPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainChardevSourcePty, gvir_config_domain_chardev_source_pty, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainChardevSourcePty, gvir_config_domain_chardev_source_pty, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); -static void gvir_config_domain_chardev_source_pty_class_init(GVirConfigDomainChardevSourcePtyClass *klass) +static void gvir_config_domain_chardev_source_pty_class_init(GVirConfigDomainChardevSourcePtyClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevSourcePtyPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c index 98ff221..7f98578 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c @@ -31,12 +31,11 @@ struct _GVirConfigDomainChardevSourceSpicePortPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainChardevSourceSpicePort, gvir_config_domain_chardev_source_spiceport, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainChardevSourceSpicePort, gvir_config_domain_chardev_source_spiceport, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); -static void gvir_config_domain_chardev_source_spiceport_class_init(GVirConfigDomainChardevSourceSpicePortClass *klass) +static void gvir_config_domain_chardev_source_spiceport_class_init(GVirConfigDomainChardevSourceSpicePortClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevSourceSpicePortPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c index d0b876b..2f63acb 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainChardevSourceSpiceVmcPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainChardevSourceSpiceVmc, gvir_config_domain_chardev_source_spicevmc, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainChardevSourceSpiceVmc, gvir_config_domain_chardev_source_spicevmc, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); -static void gvir_config_domain_chardev_source_spicevmc_class_init(GVirConfigDomainChardevSourceSpiceVmcClass *klass) +static void gvir_config_domain_chardev_source_spicevmc_class_init(GVirConfigDomainChardevSourceSpiceVmcClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevSourceSpiceVmcPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c index 069340f..854d413 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-unix.c @@ -34,12 +34,11 @@ struct _GVirConfigDomainChardevSourceUnixPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainChardevSourceUnix, gvir_config_domain_chardev_source_unix, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainChardevSourceUnix, gvir_config_domain_chardev_source_unix, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); -static void gvir_config_domain_chardev_source_unix_class_init(GVirConfigDomainChardevSourceUnixClass *klass) +static void gvir_config_domain_chardev_source_unix_class_init(GVirConfigDomainChardevSourceUnixClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevSourceUnixPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c index 117dbe1..50d4030 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c @@ -37,9 +37,8 @@ struct _GVirConfigDomainChardevSourcePrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainChardevSource, gvir_config_domain_chardev_source, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_chardev_source_class_init(GVirConfigDomainChardevSourceClass *klass) +static void gvir_config_domain_chardev_source_class_init(GVirConfigDomainChardevSourceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevSourcePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev.c index fd5e4c9..a5ebc9c 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev.c @@ -36,9 +36,8 @@ struct _GVirConfigDomainChardevPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainChardev, gvir_config_domain_chardev, GVIR_CONFIG_TYPE_DOMAIN_DEVICE) -static void gvir_config_domain_chardev_class_init(GVirConfigDomainChardevClass *klass) +static void gvir_config_domain_chardev_class_init(GVirConfigDomainChardevClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-clock.c b/libvirt-gconfig/libvirt-gconfig-domain-clock.c index 9795565..ae33623 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-clock.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-clock.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainClockPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainClock, gvir_config_domain_clock, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainClock, gvir_config_domain_clock, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_clock_class_init(GVirConfigDomainClockClass *klass) +static void gvir_config_domain_clock_class_init(GVirConfigDomainClockClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainClockPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-console.c b/libvirt-gconfig/libvirt-gconfig-domain-console.c index 5192870..ae75e11 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-console.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-console.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainConsolePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainConsole, gvir_config_domain_console, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainConsole, gvir_config_domain_console, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); -static void gvir_config_domain_console_class_init(GVirConfigDomainConsoleClass *klass) +static void gvir_config_domain_console_class_init(GVirConfigDomainConsoleClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainConsolePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c b/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c index 4262465..a15db27 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c @@ -111,12 +111,11 @@ struct _GVirConfigDomainControllerUsbPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainControllerUsb, gvir_config_domain_controller_usb, GVIR_CONFIG_TYPE_DOMAIN_CONTROLLER); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainControllerUsb, gvir_config_domain_controller_usb, GVIR_CONFIG_TYPE_DOMAIN_CONTROLLER); -static void gvir_config_domain_controller_usb_class_init(GVirConfigDomainControllerUsbClass *klass) +static void gvir_config_domain_controller_usb_class_init(GVirConfigDomainControllerUsbClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainControllerUsbPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-controller.c b/libvirt-gconfig/libvirt-gconfig-domain-controller.c index 82994fe..a2d40c3 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-controller.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-controller.c @@ -36,9 +36,8 @@ struct _GVirConfigDomainControllerPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainController, gvir_config_domain_controller, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_controller_class_init(GVirConfigDomainControllerClass *klass) +static void gvir_config_domain_controller_class_init(GVirConfigDomainControllerClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainControllerPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c b/libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c index dc5fa4e..61f0465 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-cpu-feature.c @@ -35,11 +35,10 @@ struct _GVirConfigDomainCpuFeaturePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainCpuFeature, gvir_config_domain_cpu_feature, GVIR_CONFIG_TYPE_CAPABILITIES_CPU_FEATURE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainCpuFeature, gvir_config_domain_cpu_feature, GVIR_CONFIG_TYPE_CAPABILITIES_CPU_FEATURE); -static void gvir_config_domain_cpu_feature_class_init(GVirConfigDomainCpuFeatureClass *klass) +static void gvir_config_domain_cpu_feature_class_init(GVirConfigDomainCpuFeatureClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainCpuFeaturePrivate)); } static void gvir_config_domain_cpu_feature_init(GVirConfigDomainCpuFeature *feature) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c b/libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c index 06a3ec8..6478427 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-cpu-model.c @@ -33,13 +33,12 @@ struct _GVirConfigDomainCpuModelPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainCpuModel, +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainCpuModel, gvir_config_domain_cpu_model, GVIR_CONFIG_TYPE_CAPABILITIES_CPU_MODEL); -static void gvir_config_domain_cpu_model_class_init(GVirConfigDomainCpuModelClass *klass) +static void gvir_config_domain_cpu_model_class_init(GVirConfigDomainCpuModelClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainCpuModelPrivate)); } static void gvir_config_domain_cpu_model_init(GVirConfigDomainCpuModel *model) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-cpu.c b/libvirt-gconfig/libvirt-gconfig-domain-cpu.c index 2dffae3..55a2704 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-cpu.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-cpu.c @@ -35,7 +35,7 @@ struct _GVirConfigDomainCpuPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainCpu, gvir_config_domain_cpu, GVIR_CONFIG_TYPE_CAPABILITIES_CPU); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainCpu, gvir_config_domain_cpu, GVIR_CONFIG_TYPE_CAPABILITIES_CPU); static GList * _gvir_config_domain_cpu_get_features(GVirConfigCapabilitiesCpu *cpu); @@ -47,7 +47,6 @@ static void gvir_config_domain_cpu_class_init(GVirConfigDomainCpuClass *klass) capabilities_class = GVIR_CONFIG_CAPABILITIES_CPU_CLASS(klass); capabilities_class->get_features = _gvir_config_domain_cpu_get_features; - g_type_class_add_private(klass, sizeof(GVirConfigDomainCpuPrivate)); } static void gvir_config_domain_cpu_init(GVirConfigDomainCpu *cpu) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-device.c b/libvirt-gconfig/libvirt-gconfig-domain-device.c index 2475519..b585b39 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-device.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-device.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainDevicePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainDevice, gvir_config_domain_device, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainDevice, gvir_config_domain_device, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_device_class_init(GVirConfigDomainDeviceClass *klass) +static void gvir_config_domain_device_class_init(GVirConfigDomainDeviceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainDevicePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c b/libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c index fb05e18..464fb1a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk-driver.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainDiskDriverPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainDiskDriver, gvir_config_domain_disk_driver, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainDiskDriver, gvir_config_domain_disk_driver, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_disk_driver_class_init(GVirConfigDomainDiskDriverClass *klass) +static void gvir_config_domain_disk_driver_class_init(GVirConfigDomainDiskDriverClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainDiskDriverPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index 75aaa12..d97a285 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainDiskPrivate GVirConfigDomainDiskType type; }; -G_DEFINE_TYPE(GVirConfigDomainDisk, gvir_config_domain_disk, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainDisk, gvir_config_domain_disk, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_disk_class_init(GVirConfigDomainDiskClass *klass) +static void gvir_config_domain_disk_class_init(GVirConfigDomainDiskClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainDiskPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c index 56c3a01..9a029e4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainFilesysPrivate GVirConfigDomainFilesysType type; }; -G_DEFINE_TYPE(GVirConfigDomainFilesys, gvir_config_domain_filesys, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainFilesys, gvir_config_domain_filesys, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_filesys_class_init(GVirConfigDomainFilesysClass *klass) +static void gvir_config_domain_filesys_class_init(GVirConfigDomainFilesysClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainFilesysPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c index dadf684..2ae984f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainGraphicsDesktopPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainGraphicsDesktop, gvir_config_domain_graphics_desktop, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainGraphicsDesktop, gvir_config_domain_graphics_desktop, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); -static void gvir_config_domain_graphics_desktop_class_init(GVirConfigDomainGraphicsDesktopClass *klass) +static void gvir_config_domain_graphics_desktop_class_init(GVirConfigDomainGraphicsDesktopClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsDesktopPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c index 7a2cb4d..4f7ef0f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainGraphicsRdpPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainGraphicsRdp, gvir_config_domain_graphics_rdp, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainGraphicsRdp, gvir_config_domain_graphics_rdp, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); -static void gvir_config_domain_graphics_rdp_class_init(GVirConfigDomainGraphicsRdpClass *klass) +static void gvir_config_domain_graphics_rdp_class_init(GVirConfigDomainGraphicsRdpClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsRdpPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c index 1740494..cbf8410 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainGraphicsSdlPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainGraphicsSdl, gvir_config_domain_graphics_sdl, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainGraphicsSdl, gvir_config_domain_graphics_sdl, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); -static void gvir_config_domain_graphics_sdl_class_init(GVirConfigDomainGraphicsSdlClass *klass) +static void gvir_config_domain_graphics_sdl_class_init(GVirConfigDomainGraphicsSdlClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsSdlPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c index 079ea27..9e3570e 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c @@ -34,12 +34,11 @@ struct _GVirConfigDomainGraphicsSpicePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainGraphicsSpice, gvir_config_domain_graphics_spice, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainGraphicsSpice, gvir_config_domain_graphics_spice, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); -static void gvir_config_domain_graphics_spice_class_init(GVirConfigDomainGraphicsSpiceClass *klass) +static void gvir_config_domain_graphics_spice_class_init(GVirConfigDomainGraphicsSpiceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsSpicePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c index fc26bb9..4c78b11 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainGraphicsVncPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainGraphicsVnc, gvir_config_domain_graphics_vnc, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainGraphicsVnc, gvir_config_domain_graphics_vnc, GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS); -static void gvir_config_domain_graphics_vnc_class_init(GVirConfigDomainGraphicsVncClass *klass) +static void gvir_config_domain_graphics_vnc_class_init(GVirConfigDomainGraphicsVncClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsVncPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c index 8b06e95..e35976f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics.c @@ -36,9 +36,8 @@ struct _GVirConfigDomainGraphicsPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainGraphics, gvir_config_domain_graphics, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_graphics_class_init(GVirConfigDomainGraphicsClass *klass) +static void gvir_config_domain_graphics_class_init(GVirConfigDomainGraphicsClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainGraphicsPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-hostdev-pci.c b/libvirt-gconfig/libvirt-gconfig-domain-hostdev-pci.c index c789c9c..36841e5 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-hostdev-pci.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-hostdev-pci.c @@ -34,11 +34,10 @@ struct _GVirConfigDomainHostdevPciPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainHostdevPci, gvir_config_domain_hostdev_pci, GVIR_CONFIG_TYPE_DOMAIN_HOSTDEV); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainHostdevPci, gvir_config_domain_hostdev_pci, GVIR_CONFIG_TYPE_DOMAIN_HOSTDEV); -static void gvir_config_domain_hostdev_pci_class_init(GVirConfigDomainHostdevPciClass *klass) +static void gvir_config_domain_hostdev_pci_class_init(GVirConfigDomainHostdevPciClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainHostdevPciPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-hostdev.c b/libvirt-gconfig/libvirt-gconfig-domain-hostdev.c index 459674d..ade2dc3 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-hostdev.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-hostdev.c @@ -37,9 +37,8 @@ struct _GVirConfigDomainHostdevPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainHostdev, gvir_config_domain_hostdev, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_hostdev_class_init(GVirConfigDomainHostdevClass *klass) +static void gvir_config_domain_hostdev_class_init(GVirConfigDomainHostdevClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainHostdevPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-input.c b/libvirt-gconfig/libvirt-gconfig-domain-input.c index 7734c61..9d7de77 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-input.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-input.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainInputPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainInput, gvir_config_domain_input, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainInput, gvir_config_domain_input, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_input_class_init(GVirConfigDomainInputClass *klass) +static void gvir_config_domain_input_class_init(GVirConfigDomainInputClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInputPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c index a10b3c1..33ba27b 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c @@ -36,12 +36,11 @@ struct _GVirConfigDomainInterfaceBridgePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainInterfaceBridge, gvir_config_domain_interface_bridge, GVIR_CONFIG_TYPE_DOMAIN_INTERFACE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainInterfaceBridge, gvir_config_domain_interface_bridge, GVIR_CONFIG_TYPE_DOMAIN_INTERFACE); -static void gvir_config_domain_interface_bridge_class_init(GVirConfigDomainInterfaceBridgeClass *klass) +static void gvir_config_domain_interface_bridge_class_init(GVirConfigDomainInterfaceBridgeClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceBridgePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c index abca213..e166482 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c @@ -35,11 +35,10 @@ struct _GVirConfigDomainInterfaceFilterrefParameterPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainInterfaceFilterrefParameter, gvir_config_domain_interface_filterref_parameter, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainInterfaceFilterrefParameter, gvir_config_domain_interface_filterref_parameter, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_interface_filterref_parameter_class_init(GVirConfigDomainInterfaceFilterrefParameterClass *klass) +static void gvir_config_domain_interface_filterref_parameter_class_init(GVirConfigDomainInterfaceFilterrefParameterClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceFilterrefParameterPrivate)); } static void gvir_config_domain_interface_filterref_parameter_init(GVirConfigDomainInterfaceFilterrefParameter *parameter) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c index 132d9f5..a73b6a8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c @@ -34,11 +34,10 @@ struct _GVirConfigDomainInterfaceFilterrefPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainInterfaceFilterref, gvir_config_domain_interface_filterref, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainInterfaceFilterref, gvir_config_domain_interface_filterref, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_interface_filterref_class_init(GVirConfigDomainInterfaceFilterrefClass *klass) +static void gvir_config_domain_interface_filterref_class_init(GVirConfigDomainInterfaceFilterrefClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceFilterrefPrivate)); } static void gvir_config_domain_interface_filterref_init(GVirConfigDomainInterfaceFilterref *filterref) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c index 27ad6ed..7083ad1 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c @@ -35,12 +35,11 @@ struct _GVirConfigDomainInterfaceNetworkPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainInterfaceNetwork, gvir_config_domain_interface_network, GVIR_CONFIG_TYPE_DOMAIN_INTERFACE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainInterfaceNetwork, gvir_config_domain_interface_network, GVIR_CONFIG_TYPE_DOMAIN_INTERFACE); -static void gvir_config_domain_interface_network_class_init(GVirConfigDomainInterfaceNetworkClass *klass) +static void gvir_config_domain_interface_network_class_init(GVirConfigDomainInterfaceNetworkClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceNetworkPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c index d5672d6..514d49c 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c @@ -35,12 +35,11 @@ struct _GVirConfigDomainInterfaceUserPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainInterfaceUser, gvir_config_domain_interface_user, GVIR_CONFIG_TYPE_DOMAIN_INTERFACE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainInterfaceUser, gvir_config_domain_interface_user, GVIR_CONFIG_TYPE_DOMAIN_INTERFACE); -static void gvir_config_domain_interface_user_class_init(GVirConfigDomainInterfaceUserClass *klass) +static void gvir_config_domain_interface_user_class_init(GVirConfigDomainInterfaceUserClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceUserPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c b/libvirt-gconfig/libvirt-gconfig-domain-interface.c index c5b57bd..2b841b3 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c @@ -38,9 +38,8 @@ struct _GVirConfigDomainInterfacePrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainInterface, gvir_config_domain_interface, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_interface_class_init(GVirConfigDomainInterfaceClass *klass) +static void gvir_config_domain_interface_class_init(GVirConfigDomainInterfaceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfacePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c b/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c index c5d7768..509064e 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-memballoon.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainMemballoonPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainMemballoon, gvir_config_domain_memballoon, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainMemballoon, gvir_config_domain_memballoon, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_memballoon_class_init(GVirConfigDomainMemballoonClass *klass) +static void gvir_config_domain_memballoon_class_init(GVirConfigDomainMemballoonClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainMemballoonPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.c b/libvirt-gconfig/libvirt-gconfig-domain-os.c index 9a00ef4..f12e1e7 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainOsPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainOs, gvir_config_domain_os, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainOs, gvir_config_domain_os, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_os_class_init(GVirConfigDomainOsClass *klass) +static void gvir_config_domain_os_class_init(GVirConfigDomainOsClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainOsPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-parallel.c b/libvirt-gconfig/libvirt-gconfig-domain-parallel.c index f48d1b6..d523f06 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-parallel.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-parallel.c @@ -32,12 +32,11 @@ struct _GVirConfigDomainParallelPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainParallel, gvir_config_domain_parallel, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainParallel, gvir_config_domain_parallel, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); -static void gvir_config_domain_parallel_class_init(GVirConfigDomainParallelClass *klass) +static void gvir_config_domain_parallel_class_init(GVirConfigDomainParallelClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainParallelPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-power-management.c b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c index c070a0f..7488e7a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-power-management.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c @@ -38,14 +38,13 @@ struct _GVirConfigDomainPowerManagementPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainPowerManagement, +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainPowerManagement, gvir_config_domain_power_management, GVIR_CONFIG_TYPE_OBJECT); static void gvir_config_domain_power_management_class_init - (GVirConfigDomainPowerManagementClass *klass) + (GVirConfigDomainPowerManagementClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainPowerManagementPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-redirdev.c b/libvirt-gconfig/libvirt-gconfig-domain-redirdev.c index 5fd4dda..1d1b321 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-redirdev.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-redirdev.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainRedirdevPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainRedirdev, gvir_config_domain_redirdev, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainRedirdev, gvir_config_domain_redirdev, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); -static void gvir_config_domain_redirdev_class_init(GVirConfigDomainRedirdevClass *klass) +static void gvir_config_domain_redirdev_class_init(GVirConfigDomainRedirdevClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainRedirdevPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c index 77d8aa0..acb8fa2 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-seclabel.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainSeclabelPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSeclabel, gvir_config_domain_seclabel, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSeclabel, gvir_config_domain_seclabel, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_seclabel_class_init(GVirConfigDomainSeclabelClass *klass) +static void gvir_config_domain_seclabel_class_init(GVirConfigDomainSeclabelClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSeclabelPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-serial.c b/libvirt-gconfig/libvirt-gconfig-domain-serial.c index 84adb2a..2523f4a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-serial.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-serial.c @@ -32,12 +32,11 @@ struct _GVirConfigDomainSerialPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSerial, gvir_config_domain_serial, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSerial, gvir_config_domain_serial, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV); -static void gvir_config_domain_serial_class_init(GVirConfigDomainSerialClass *klass) +static void gvir_config_domain_serial_class_init(GVirConfigDomainSerialClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSerialPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c index ab5abc4..be90d3a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host-certificates.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainSmartcardHostCertificatesPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSmartcardHostCertificates, gvir_config_domain_smartcard_host_certificates, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSmartcardHostCertificates, gvir_config_domain_smartcard_host_certificates, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); -static void gvir_config_domain_smartcard_host_certificates_class_init(GVirConfigDomainSmartcardHostCertificatesClass *klass) +static void gvir_config_domain_smartcard_host_certificates_class_init(GVirConfigDomainSmartcardHostCertificatesClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardHostCertificatesPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c index b29e07b..4ef8b90 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-host.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainSmartcardHostPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSmartcardHost, gvir_config_domain_smartcard_host, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSmartcardHost, gvir_config_domain_smartcard_host, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); -static void gvir_config_domain_smartcard_host_class_init(GVirConfigDomainSmartcardHostClass *klass) +static void gvir_config_domain_smartcard_host_class_init(GVirConfigDomainSmartcardHostClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardHostPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c index 830faa4..2d2fb97 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard-passthrough.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainSmartcardPassthroughPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSmartcardPassthrough, gvir_config_domain_smartcard_passthrough, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSmartcardPassthrough, gvir_config_domain_smartcard_passthrough, GVIR_CONFIG_TYPE_DOMAIN_SMARTCARD); -static void gvir_config_domain_smartcard_passthrough_class_init(GVirConfigDomainSmartcardPassthroughClass *klass) +static void gvir_config_domain_smartcard_passthrough_class_init(GVirConfigDomainSmartcardPassthroughClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardPassthroughPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c index 7900c1a..f7c65f0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-smartcard.c @@ -36,9 +36,8 @@ struct _GVirConfigDomainSmartcardPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainSmartcard, gvir_config_domain_smartcard, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_smartcard_class_init(GVirConfigDomainSmartcardClass *klass) +static void gvir_config_domain_smartcard_class_init(GVirConfigDomainSmartcardClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSmartcardPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c index ba7a40e..041f6db 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c @@ -34,12 +34,11 @@ struct _GVirConfigDomainSnapshotDiskPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSnapshotDisk, gvir_config_domain_snapshot_disk, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSnapshotDisk, gvir_config_domain_snapshot_disk, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_snapshot_disk_class_init(GVirConfigDomainSnapshotDiskClass *klass) +static void gvir_config_domain_snapshot_disk_class_init(GVirConfigDomainSnapshotDiskClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSnapshotDiskPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c index 69b7df7..ae79932 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-snapshot.c @@ -35,12 +35,11 @@ struct _GVirConfigDomainSnapshotPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSnapshot, gvir_config_domain_snapshot, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSnapshot, gvir_config_domain_snapshot, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_snapshot_class_init(GVirConfigDomainSnapshotClass *klass) +static void gvir_config_domain_snapshot_class_init(GVirConfigDomainSnapshotClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSnapshotPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-sound.c b/libvirt-gconfig/libvirt-gconfig-domain-sound.c index 7ce71bd..937143c 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-sound.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-sound.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainSoundPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainSound, gvir_config_domain_sound, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainSound, gvir_config_domain_sound, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_sound_class_init(GVirConfigDomainSoundClass *klass) +static void gvir_config_domain_sound_class_init(GVirConfigDomainSoundClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainSoundPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c b/libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c index ba74a28..ba24cb9 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-hpet.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainTimerHpetPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainTimerHpet, gvir_config_domain_timer_hpet, GVIR_CONFIG_TYPE_DOMAIN_TIMER); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainTimerHpet, gvir_config_domain_timer_hpet, GVIR_CONFIG_TYPE_DOMAIN_TIMER); -static void gvir_config_domain_timer_hpet_class_init(GVirConfigDomainTimerHpetClass *klass) +static void gvir_config_domain_timer_hpet_class_init(GVirConfigDomainTimerHpetClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainTimerHpetPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c b/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c index af979b2..1bc13b4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainTimerPitPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainTimerPit, gvir_config_domain_timer_pit, GVIR_CONFIG_TYPE_DOMAIN_TIMER); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainTimerPit, gvir_config_domain_timer_pit, GVIR_CONFIG_TYPE_DOMAIN_TIMER); -static void gvir_config_domain_timer_pit_class_init(GVirConfigDomainTimerPitClass *klass) +static void gvir_config_domain_timer_pit_class_init(GVirConfigDomainTimerPitClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainTimerPitPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c b/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c index 0adcc66..06a76c8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c @@ -33,12 +33,11 @@ struct _GVirConfigDomainTimerRtcPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainTimerRtc, gvir_config_domain_timer_rtc, GVIR_CONFIG_TYPE_DOMAIN_TIMER); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainTimerRtc, gvir_config_domain_timer_rtc, GVIR_CONFIG_TYPE_DOMAIN_TIMER); -static void gvir_config_domain_timer_rtc_class_init(GVirConfigDomainTimerRtcClass *klass) +static void gvir_config_domain_timer_rtc_class_init(GVirConfigDomainTimerRtcClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainTimerRtcPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer.c b/libvirt-gconfig/libvirt-gconfig-domain-timer.c index e89e111..f33a56f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer.c @@ -36,9 +36,8 @@ struct _GVirConfigDomainTimerPrivate G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainTimer, gvir_config_domain_timer, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_domain_timer_class_init(GVirConfigDomainTimerClass *klass) +static void gvir_config_domain_timer_class_init(GVirConfigDomainTimerClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainTimerPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-video.c b/libvirt-gconfig/libvirt-gconfig-domain-video.c index ed11476..3a98cf0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-video.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-video.c @@ -34,12 +34,11 @@ struct _GVirConfigDomainVideoPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomainVideo, gvir_config_domain_video, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomainVideo, gvir_config_domain_video, GVIR_CONFIG_TYPE_DOMAIN_DEVICE); -static void gvir_config_domain_video_class_init(GVirConfigDomainVideoClass *klass) +static void gvir_config_domain_video_class_init(GVirConfigDomainVideoClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigDomainVideoPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index de84fd4..82f8516 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -34,7 +34,7 @@ struct _GVirConfigDomainPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigDomain, gvir_config_domain, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigDomain, gvir_config_domain, GVIR_CONFIG_TYPE_OBJECT); enum { PROP_0, @@ -128,7 +128,6 @@ static void gvir_config_domain_class_init(GVirConfigDomainClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); - g_type_class_add_private(klass, sizeof(GVirConfigDomainPrivate)); object_class->get_property = gvir_config_domain_get_property; object_class->set_property = gvir_config_domain_set_property; diff --git a/libvirt-gconfig/libvirt-gconfig-interface.c b/libvirt-gconfig/libvirt-gconfig-interface.c index 6c81325..dbf261a 100644 --- a/libvirt-gconfig/libvirt-gconfig-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-interface.c @@ -33,12 +33,11 @@ struct _GVirConfigInterfacePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigInterface, gvir_config_interface, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigInterface, gvir_config_interface, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_interface_class_init(GVirConfigInterfaceClass *klass) +static void gvir_config_interface_class_init(GVirConfigInterfaceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigInterfacePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-network-filter.c b/libvirt-gconfig/libvirt-gconfig-network-filter.c index eddf05c..b1b1476 100644 --- a/libvirt-gconfig/libvirt-gconfig-network-filter.c +++ b/libvirt-gconfig/libvirt-gconfig-network-filter.c @@ -33,12 +33,11 @@ struct _GVirConfigNetworkFilterPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigNetworkFilter, gvir_config_network_filter, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigNetworkFilter, gvir_config_network_filter, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_network_filter_class_init(GVirConfigNetworkFilterClass *klass) +static void gvir_config_network_filter_class_init(GVirConfigNetworkFilterClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigNetworkFilterPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-network.c b/libvirt-gconfig/libvirt-gconfig-network.c index 963d056..14e76bb 100644 --- a/libvirt-gconfig/libvirt-gconfig-network.c +++ b/libvirt-gconfig/libvirt-gconfig-network.c @@ -33,12 +33,11 @@ struct _GVirConfigNetworkPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigNetwork, gvir_config_network, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigNetwork, gvir_config_network, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_network_class_init(GVirConfigNetworkClass *klass) +static void gvir_config_network_class_init(GVirConfigNetworkClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigNetworkPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-node-device.c b/libvirt-gconfig/libvirt-gconfig-node-device.c index b89690f..40bd415 100644 --- a/libvirt-gconfig/libvirt-gconfig-node-device.c +++ b/libvirt-gconfig/libvirt-gconfig-node-device.c @@ -33,12 +33,11 @@ struct _GVirConfigNodeDevicePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigNodeDevice, gvir_config_node_device, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigNodeDevice, gvir_config_node_device, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_node_device_class_init(GVirConfigNodeDeviceClass *klass) +static void gvir_config_node_device_class_init(GVirConfigNodeDeviceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigNodeDevicePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index ca2c6e6..fffbd21 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -42,7 +42,7 @@ struct _GVirConfigObjectPrivate xmlNodePtr node; }; -G_DEFINE_TYPE(GVirConfigObject, gvir_config_object, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigObject, gvir_config_object, G_TYPE_OBJECT); enum { PROP_0, @@ -175,8 +175,6 @@ static void gvir_config_object_class_init(GVirConfigObjectClass *klass) G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - - g_type_class_add_private(klass, sizeof(GVirConfigObjectPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-secret.c b/libvirt-gconfig/libvirt-gconfig-secret.c index 73a3fc3..5bdb53a 100644 --- a/libvirt-gconfig/libvirt-gconfig-secret.c +++ b/libvirt-gconfig/libvirt-gconfig-secret.c @@ -33,12 +33,11 @@ struct _GVirConfigSecretPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigSecret, gvir_config_secret, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigSecret, gvir_config_secret, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_secret_class_init(GVirConfigSecretClass *klass) +static void gvir_config_secret_class_init(GVirConfigSecretClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigSecretPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-permissions.c b/libvirt-gconfig/libvirt-gconfig-storage-permissions.c index 79c3b9e..886c6de 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-permissions.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-permissions.c @@ -33,12 +33,11 @@ struct _GVirConfigStoragePermissionsPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStoragePermissions, gvir_config_storage_permissions, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStoragePermissions, gvir_config_storage_permissions, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_permissions_class_init(GVirConfigStoragePermissionsClass *klass) +static void gvir_config_storage_permissions_class_init(GVirConfigStoragePermissionsClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStoragePermissionsPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c b/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c index 07af50b..987b97d 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool-source.c @@ -34,12 +34,11 @@ struct _GVirConfigStoragePoolSourcePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStoragePoolSource, gvir_config_storage_pool_source, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStoragePoolSource, gvir_config_storage_pool_source, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_pool_source_class_init(GVirConfigStoragePoolSourceClass *klass) +static void gvir_config_storage_pool_source_class_init(GVirConfigStoragePoolSourceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStoragePoolSourcePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c b/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c index 72ea21d..a686479 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool-target.c @@ -34,12 +34,11 @@ struct _GVirConfigStoragePoolTargetPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStoragePoolTarget, gvir_config_storage_pool_target, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStoragePoolTarget, gvir_config_storage_pool_target, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_pool_target_class_init(GVirConfigStoragePoolTargetClass *klass) +static void gvir_config_storage_pool_target_class_init(GVirConfigStoragePoolTargetClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStoragePoolTargetPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.c b/libvirt-gconfig/libvirt-gconfig-storage-pool.c index 0c7940d..72cfa28 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.c @@ -35,12 +35,11 @@ struct _GVirConfigStoragePoolPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStoragePool, gvir_config_storage_pool, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStoragePool, gvir_config_storage_pool, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_pool_class_init(GVirConfigStoragePoolClass *klass) +static void gvir_config_storage_pool_class_init(GVirConfigStoragePoolClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStoragePoolPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c b/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c index 14a0e22..b574af0 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-backing-store.c @@ -34,12 +34,11 @@ struct _GVirConfigStorageVolBackingStorePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStorageVolBackingStore, gvir_config_storage_vol_backing_store, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStorageVolBackingStore, gvir_config_storage_vol_backing_store, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_vol_backing_store_class_init(GVirConfigStorageVolBackingStoreClass *klass) +static void gvir_config_storage_vol_backing_store_class_init(GVirConfigStorageVolBackingStoreClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStorageVolBackingStorePrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c index cf4c0c7..751c950 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol-target.c @@ -34,12 +34,11 @@ struct _GVirConfigStorageVolTargetPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStorageVolTarget, gvir_config_storage_vol_target, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStorageVolTarget, gvir_config_storage_vol_target, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_vol_target_class_init(GVirConfigStorageVolTargetClass *klass) +static void gvir_config_storage_vol_target_class_init(GVirConfigStorageVolTargetClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStorageVolTargetPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-storage-vol.c b/libvirt-gconfig/libvirt-gconfig-storage-vol.c index 2dade7e..76ac105 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-vol.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-vol.c @@ -35,12 +35,11 @@ struct _GVirConfigStorageVolPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirConfigStorageVol, gvir_config_storage_vol, GVIR_CONFIG_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigStorageVol, gvir_config_storage_vol, GVIR_CONFIG_TYPE_OBJECT); -static void gvir_config_storage_vol_class_init(GVirConfigStorageVolClass *klass) +static void gvir_config_storage_vol_class_init(GVirConfigStorageVolClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirConfigStorageVolPrivate)); } diff --git a/libvirt-gconfig/libvirt-gconfig-xml-doc.c b/libvirt-gconfig/libvirt-gconfig-xml-doc.c index d17da21..fd461d7 100644 --- a/libvirt-gconfig/libvirt-gconfig-xml-doc.c +++ b/libvirt-gconfig/libvirt-gconfig-xml-doc.c @@ -37,7 +37,7 @@ struct _GVirConfigXmlDocPrivate xmlDocPtr doc; }; -G_DEFINE_TYPE(GVirConfigXmlDoc, gvir_config_xml_doc, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConfigXmlDoc, gvir_config_xml_doc, G_TYPE_OBJECT); enum { PROP_0, @@ -90,7 +90,6 @@ static void gvir_config_xml_doc_class_init(GVirConfigXmlDocClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); - g_type_class_add_private(klass, sizeof(GVirConfigXmlDocPrivate)); object_class->finalize = gvir_config_xml_doc_finalize; object_class->get_property = gvir_config_xml_doc_get_property; diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 3f17265..b8f88b3 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -48,7 +48,7 @@ struct _GVirConnectionPrivate GHashTable *networks; }; -G_DEFINE_TYPE(GVirConnection, gvir_connection, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirConnection, gvir_connection, G_TYPE_OBJECT); enum { @@ -231,7 +231,6 @@ static void gvir_connection_class_init(GVirConnectionClass *klass) 1, GVIR_TYPE_DOMAIN); - g_type_class_add_private(klass, sizeof(GVirConnectionPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-domain-device.c b/libvirt-gobject/libvirt-gobject-domain-device.c index 8986e44..c113941 100644 --- a/libvirt-gobject/libvirt-gobject-domain-device.c +++ b/libvirt-gobject/libvirt-gobject-domain-device.c @@ -135,7 +135,6 @@ static void gvir_domain_device_class_init(GVirDomainDeviceClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirDomainDevicePrivate)); } static void gvir_domain_device_init(GVirDomainDevice *self) diff --git a/libvirt-gobject/libvirt-gobject-domain-disk.c b/libvirt-gobject/libvirt-gobject-domain-disk.c index bb2a682..f0cb848 100644 --- a/libvirt-gobject/libvirt-gobject-domain-disk.c +++ b/libvirt-gobject/libvirt-gobject-domain-disk.c @@ -39,7 +39,7 @@ struct _GVirDomainDiskPrivate gboolean unused; }; -G_DEFINE_TYPE(GVirDomainDisk, gvir_domain_disk, GVIR_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirDomainDisk, gvir_domain_disk, GVIR_TYPE_DOMAIN_DEVICE); #define GVIR_DOMAIN_DISK_ERROR gvir_domain_disk_error_quark() @@ -49,9 +49,8 @@ gvir_domain_disk_error_quark(void) return g_quark_from_static_string("gvir-domain-disk"); } -static void gvir_domain_disk_class_init(GVirDomainDiskClass *klass) +static void gvir_domain_disk_class_init(GVirDomainDiskClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirDomainDiskPrivate)); } static void gvir_domain_disk_init(GVirDomainDisk *self) diff --git a/libvirt-gobject/libvirt-gobject-domain-interface.c b/libvirt-gobject/libvirt-gobject-domain-interface.c index beae11e..f58d088 100644 --- a/libvirt-gobject/libvirt-gobject-domain-interface.c +++ b/libvirt-gobject/libvirt-gobject-domain-interface.c @@ -39,7 +39,7 @@ struct _GVirDomainInterfacePrivate gboolean unused; }; -G_DEFINE_TYPE(GVirDomainInterface, gvir_domain_interface, GVIR_TYPE_DOMAIN_DEVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirDomainInterface, gvir_domain_interface, GVIR_TYPE_DOMAIN_DEVICE); #define GVIR_DOMAIN_INTERFACE_ERROR gvir_domain_interface_error_quark() @@ -49,9 +49,8 @@ gvir_domain_interface_error_quark(void) return g_quark_from_static_string("gvir-domain-interface"); } -static void gvir_domain_interface_class_init(GVirDomainInterfaceClass *klass) +static void gvir_domain_interface_class_init(GVirDomainInterfaceClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirDomainInterfacePrivate)); } static void gvir_domain_interface_init(GVirDomainInterface *self) diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index 2a4338b..decdc68 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -38,7 +38,7 @@ struct _GVirDomainSnapshotPrivate virDomainSnapshotPtr handle; }; -G_DEFINE_TYPE(GVirDomainSnapshot, gvir_domain_snapshot, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirDomainSnapshot, gvir_domain_snapshot, G_TYPE_OBJECT); enum { @@ -126,7 +126,6 @@ static void gvir_domain_snapshot_class_init(GVirDomainSnapshotClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirDomainSnapshotPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 7be936d..b522ff0 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -46,7 +46,7 @@ struct _GVirDomainPrivate GMutex *lock; }; -G_DEFINE_TYPE(GVirDomain, gvir_domain, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirDomain, gvir_domain, G_TYPE_OBJECT); enum { @@ -247,7 +247,6 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_TYPE_NONE, 0); - g_type_class_add_private(klass, sizeof(GVirDomainPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-input-stream.c b/libvirt-gobject/libvirt-gobject-input-stream.c index 788e16e..2df975c 100644 --- a/libvirt-gobject/libvirt-gobject-input-stream.c +++ b/libvirt-gobject/libvirt-gobject-input-stream.c @@ -31,9 +31,6 @@ #include "libvirt-gobject-input-stream.h" #include "libvirt-gobject-compat.h" -#define gvir_input_stream_get_type _gvir_input_stream_get_type -G_DEFINE_TYPE(GVirInputStream, gvir_input_stream, G_TYPE_INPUT_STREAM); - enum { PROP_0, @@ -50,6 +47,9 @@ struct _GVirInputStreamPrivate gsize count; }; +#define gvir_input_stream_get_type _gvir_input_stream_get_type +G_DEFINE_TYPE_WITH_PRIVATE(GVirInputStream, gvir_input_stream, G_TYPE_INPUT_STREAM); + static void gvir_input_stream_get_property(GObject *object, guint prop_id, GValue *value, @@ -196,7 +196,6 @@ static void gvir_input_stream_class_init(GVirInputStreamClass *klass) GObjectClass *gobject_class = G_OBJECT_CLASS(klass); GInputStreamClass *ginputstream_class = G_INPUT_STREAM_CLASS(klass); - g_type_class_add_private(klass, sizeof(GVirInputStreamPrivate)); gobject_class->finalize = gvir_input_stream_finalize; gobject_class->get_property = gvir_input_stream_get_property; diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index ed7421f..1bd75bd 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -38,7 +38,7 @@ struct _GVirInterfacePrivate virInterfacePtr handle; }; -G_DEFINE_TYPE(GVirInterface, gvir_interface, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirInterface, gvir_interface, G_TYPE_OBJECT); enum { @@ -126,7 +126,6 @@ static void gvir_interface_class_init(GVirInterfaceClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirInterfacePrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index bbd5f84..023df53 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -39,7 +39,7 @@ struct _GVirManagerPrivate GList *connections; }; -G_DEFINE_TYPE(GVirManager, gvir_manager, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirManager, gvir_manager, G_TYPE_OBJECT); enum { @@ -102,7 +102,6 @@ static void gvir_manager_class_init(GVirManagerClass *klass) 1, GVIR_TYPE_CONNECTION); - g_type_class_add_private(klass, sizeof(GVirManagerPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c b/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c index 200778d..6bed50c 100644 --- a/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c +++ b/libvirt-gobject/libvirt-gobject-network-dhcp-lease.c @@ -46,7 +46,7 @@ struct _GVirNetworkDHCPLeasePrivate #endif /* HAVE_VIR_NETWORK_GET_DHCP_LEASES */ }; -G_DEFINE_TYPE(GVirNetworkDHCPLease, gvir_network_dhcp_lease, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirNetworkDHCPLease, gvir_network_dhcp_lease, G_TYPE_OBJECT); enum { PROP_0, @@ -124,7 +124,6 @@ static void gvir_network_dhcp_lease_class_init(GVirNetworkDHCPLeaseClass *klass) G_PARAM_PRIVATE | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirNetworkDHCPLeasePrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index 7c5d6c0..d63d48a 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -39,7 +39,7 @@ struct _GVirNetworkFilterPrivate gchar uuid[VIR_UUID_STRING_BUFLEN]; }; -G_DEFINE_TYPE(GVirNetworkFilter, gvir_network_filter, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirNetworkFilter, gvir_network_filter, G_TYPE_OBJECT); enum { @@ -142,7 +142,6 @@ static void gvir_network_filter_class_init(GVirNetworkFilterClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirNetworkFilterPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 0129a73..b607cf8 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -42,7 +42,7 @@ struct _GVirNetworkPrivate gchar uuid[VIR_UUID_STRING_BUFLEN]; }; -G_DEFINE_TYPE(GVirNetwork, gvir_network, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirNetwork, gvir_network, G_TYPE_OBJECT); enum { @@ -142,7 +142,6 @@ static void gvir_network_class_init(GVirNetworkClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirNetworkPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index b7b7c9e..ecc448c 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -38,7 +38,7 @@ struct _GVirNodeDevicePrivate virNodeDevicePtr handle; }; -G_DEFINE_TYPE(GVirNodeDevice, gvir_node_device, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirNodeDevice, gvir_node_device, G_TYPE_OBJECT); enum { @@ -126,7 +126,6 @@ static void gvir_node_device_class_init(GVirNodeDeviceClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirNodeDevicePrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-output-stream.c b/libvirt-gobject/libvirt-gobject-output-stream.c index 97feb80..6869b4d 100644 --- a/libvirt-gobject/libvirt-gobject-output-stream.c +++ b/libvirt-gobject/libvirt-gobject-output-stream.c @@ -31,9 +31,6 @@ #include "libvirt-gobject-output-stream.h" #include "libvirt-gobject-compat.h" -#define gvir_output_stream_get_type _gvir_output_stream_get_type -G_DEFINE_TYPE(GVirOutputStream, gvir_output_stream, G_TYPE_OUTPUT_STREAM); - enum { PROP_0, @@ -50,6 +47,9 @@ struct _GVirOutputStreamPrivate gsize count; }; +#define gvir_output_stream_get_type _gvir_output_stream_get_type +G_DEFINE_TYPE_WITH_PRIVATE(GVirOutputStream, gvir_output_stream, G_TYPE_OUTPUT_STREAM); + static void gvir_output_stream_get_property(GObject *object, guint prop_id, GValue *value, @@ -196,7 +196,6 @@ static void gvir_output_stream_class_init(GVirOutputStreamClass *klass) GObjectClass *gobject_class = G_OBJECT_CLASS(klass); GOutputStreamClass *goutputstream_class = G_OUTPUT_STREAM_CLASS(klass); - g_type_class_add_private(klass, sizeof(GVirOutputStreamPrivate)); gobject_class->finalize = gvir_output_stream_finalize; gobject_class->get_property = gvir_output_stream_get_property; diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index bf15931..81f72b8 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -39,7 +39,7 @@ struct _GVirSecretPrivate gchar uuid[VIR_UUID_STRING_BUFLEN]; }; -G_DEFINE_TYPE(GVirSecret, gvir_secret, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSecret, gvir_secret, G_TYPE_OBJECT); enum { @@ -141,7 +141,6 @@ static void gvir_secret_class_init(GVirSecretClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirSecretPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 227bf23..175b6f0 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -43,7 +43,7 @@ struct _GVirStoragePoolPrivate gchar uuid[VIR_UUID_STRING_BUFLEN]; }; -G_DEFINE_TYPE(GVirStoragePool, gvir_storage_pool, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirStoragePool, gvir_storage_pool, G_TYPE_OBJECT); enum { @@ -153,7 +153,6 @@ static void gvir_storage_pool_class_init(GVirStoragePoolClass *klass) G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirStoragePoolPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 18aa8b3..2a9c67f 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -41,7 +41,7 @@ struct _GVirStorageVolPrivate GVirStoragePool *pool; }; -G_DEFINE_TYPE(GVirStorageVol, gvir_storage_vol, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirStorageVol, gvir_storage_vol, G_TYPE_OBJECT); enum { @@ -148,7 +148,6 @@ static void gvir_storage_vol_class_init(GVirStorageVolClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirStorageVolPrivate)); } diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index a518a19..c175353 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -58,7 +58,7 @@ typedef struct { } GVirStreamSource; -G_DEFINE_TYPE(GVirStream, gvir_stream, G_TYPE_IO_STREAM); +G_DEFINE_TYPE_WITH_PRIVATE(GVirStream, gvir_stream, G_TYPE_IO_STREAM); enum { @@ -279,7 +279,6 @@ static void gvir_stream_class_init(GVirStreamClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - g_type_class_add_private(klass, sizeof(GVirStreamPrivate)); } -- 2.16.4

3 8

[libvirt] [PATCH v2 0/3] vsh: Introduce new API for printing tables
by Simon Kobyda 15 Aug '18

15 Aug '18

Created new API for priting tables, mainly to solve alignment problems. Implemented these test to virsh list. In the future, API may be everywhere in virsh and virt-admin. Also wrote basic tests for the new API, and corrected tests in virshtest which are influenced by implementation of the API in virsh list. Diff to v2: - added tests - fixed alignment for unicode character which span more spaces - moved ncolumns check to vshTableRowAppend - changed arguments for functions vshTablePrint, vshTablePrintToStdout, vshTablePrintToString Simon Kobyda (3): vsh: Add API for printing tables. virsh: Implement new table API for virsh list vsh: Added tests tests/Makefile.am | 8 + tests/virshtest.c | 14 +- tests/vshtabletest.c | 247 +++++++++++++++++++++ tools/Makefile.am | 4 +- tools/virsh-domain-monitor.c | 43 ++-- tools/vsh-table.c | 413 +++++++++++++++++++++++++++++++++++ tools/vsh-table.h | 42 ++++ 7 files changed, 744 insertions(+), 27 deletions(-) create mode 100644 tests/vshtabletest.c create mode 100644 tools/vsh-table.c create mode 100644 tools/vsh-table.h -- 2.17.1

1 3

[libvirt] [PATCH] storage: Properly terminate secrets
by Michal Privoznik 15 Aug '18

15 Aug '18

The virSecretGetSecretString() helper looks up a secret for given pool and returns its value in @secret_value and its length in @secret_value_size. However, the trailing '\0' is not included in either of the variables. This is because usually the value of the secret is passed to some encoder (usually base64 encoder) where the trailing zero must not be accounted for. However, in two places we actually want the string as we don't process is any further. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I wonder if putting this realloc into virSecretGetSecretString() would be a better fix or not. I mean, without changing @secret_size. Opinions? src/storage/storage_backend_iscsi.c | 5 +++++ src/storage/storage_backend_iscsi_direct.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 6242cd0fac..55fe47f5e1 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -303,6 +303,11 @@ virStorageBackendISCSISetAuth(const char *portal, &secret_value, &secret_size) < 0) goto cleanup; + if (VIR_REALLOC_N(secret_value, secret_size + 1) < 0) + goto cleanup; + + secret_value[secret_size] = '\0'; + if (virISCSINodeUpdate(portal, source->devices[0].path, "node.session.auth.authmethod", diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 1624066e9c..0d7d6ba9c3 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -115,6 +115,11 @@ virStorageBackendISCSIDirectSetAuth(struct iscsi_context *iscsi, &secret_value, &secret_size) < 0) goto cleanup; + if (VIR_REALLOC_N(secret_value, secret_size + 1) < 0) + goto cleanup; + + secret_value[secret_size] = '\0'; + if (iscsi_set_initiator_username_pwd(iscsi, authdef->username, (const char *)secret_value) < 0) { -- 2.16.4

2 1

[libvirt] [PATCH v3 0/3] Don't touch user data from tests
by Michal Privoznik 15 Aug '18

15 Aug '18

v3 of: https://www.redhat.com/archives/libvir-list/2018-July/msg00747.html diff to v2: - pushed some already ACKed patches - dropped controversial line from 1/3 that turned off error reporting Michal Prívozník (3): qemuxml2argvtest: Set more fake drivers check-file-access: Allow specifying action virtestmock: Track action tests/check-file-access.pl | 32 +++++++++++++++++++++++++++----- tests/file_access_whitelist.txt | 15 ++++++++++----- tests/qemuxml2argvtest.c | 4 ++++ tests/virtestmock.c | 39 ++++++++++++++++++++++----------------- 4 files changed, 63 insertions(+), 27 deletions(-) -- 2.16.4

3 10

[libvirt] [PATCH] rpc: Initialize a worker pool for max_workers=0 as well
by Marc Hartmayer 15 Aug '18

15 Aug '18

Semantically, there is no difference between an uninitialized worker pool and an initialized worker pool with zero workers. Let's allow the worker pool to be initialized for max_workers=0 as well then which makes the API more symmetric and simplifies code. Validity of the worker pool is delegated to virThreadPoolGetMaxWorkers instead. This patch fixes segmentation faults in virNetServerGetThreadPoolParameters and virNetServerSetThreadPoolParameters for the case when no worker pool is actually initialized (max_workers=0). Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- src/rpc/virnetserver.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index c26637ed031d..b4461b3803cf 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -205,7 +205,7 @@ virNetServerDispatchNewMessage(virNetServerClientPtr client, virObjectRef(srv); virObjectUnlock(srv); - if (srv->workers) { + if (virThreadPoolGetMaxWorkers(srv->workers) > 0) { virNetServerJobPtr job; if (VIR_ALLOC(job) < 0) @@ -367,8 +367,7 @@ virNetServerPtr virNetServerNew(const char *name, if (!(srv = virObjectLockableNew(virNetServerClass))) return NULL; - if (max_workers && - !(srv->workers = virThreadPoolNew(min_workers, max_workers, + if (!(srv->workers = virThreadPoolNew(min_workers, max_workers, priority_workers, virNetServerHandleJob, srv))) @@ -579,21 +578,18 @@ virJSONValuePtr virNetServerPreExecRestart(virNetServerPtr srv) goto error; if (virJSONValueObjectAppendNumberUint(object, "min_workers", - srv->workers == NULL ? 0 : virThreadPoolGetMinWorkers(srv->workers)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot set min_workers data in JSON document")); goto error; } if (virJSONValueObjectAppendNumberUint(object, "max_workers", - srv->workers == NULL ? 0 : virThreadPoolGetMaxWorkers(srv->workers)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot set max_workers data in JSON document")); goto error; } if (virJSONValueObjectAppendNumberUint(object, "priority_workers", - srv->workers == NULL ? 0 : virThreadPoolGetPriorityWorkers(srv->workers)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot set priority_workers data in JSON document")); -- 2.13.4

2 2

[libvirt] [PATCH 0/2] esx: Fix {g,s}et vcpus
by Marcos Paulo de Souza 14 Aug '18

14 Aug '18

Hi guys, while checking my ESXi 6.5, and trying to query and change vcpus values, I discovered this was not working. So, these two patches aim to fix the problem. I checked some docs[1]. Let me know if there are points where it can be improved. Thanks, [1] https://www.vmware.com/support/orchestrator/doc/vco_vsphere55_api/html/VcHo… Marcos Paulo de Souza (2): esx: Make esxDomainGetVcpusFlags return vcpus again esx:Fix esxDomainGetMaxVcpus to return correct vcpus src/esx/esx_driver.c | 72 +++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 27 deletions(-) -- 2.17.1

3 6

[libvirt] [PATCH 00/11] More virAuthGet* cleanups
by John Ferlan 14 Aug '18

14 Aug '18

In a case of review collision, Michal pushed Marcos Paulo de Souza's series after I had reviewed, but before seeing my review (oh well): https://www.redhat.com/archives/libvir-list/2018-August/msg00874.html Rather than worry about it, here's a series of changes that I described in my review: https://www.redhat.com/archives/libvir-list/2018-August/msg00860.html based on top of Marcos' now pushed weries. The only thing I didn't cover in this was my comment regarding xenapiUtil_RequestPassword - I just left it as is. John Ferlan (11): util: Alter virAuthGet*Path API to check valid parameters util: Alter virAuthGet*Path API to check valid callback util: Remove invalid parameter checks from virAuthGet{Username|Password} util: Alter virAuthGet*Path API return processing util: Alter virAuthGet*Path API to generate auth->cb error esx: Don't overwrite virAuthGet{Username|Password} errors hyperv: Don't overwrite virAuthGet{Username|Password} errors phyp: Don't overwrite virAuthGet{Username|Password} errors xenapi: Don't overwrite virAuthGet{Username|Password} errors test: Don't overwrite virAuthGet{Username|Password} errors rpc: Don't overwrite virAuthGet{Username|Password}Path errors src/esx/esx_driver.c | 27 ++++------------ src/hyperv/hyperv_driver.c | 16 +++------ src/phyp/phyp_driver.c | 16 +++------ src/rpc/virnetlibsshsession.c | 2 -- src/rpc/virnetsshsession.c | 5 +-- src/test/test_driver.c | 15 +++------ src/util/virauth.c | 61 ++++++++++++++++++++++++----------- src/xenapi/xenapi_driver.c | 16 +++------ 8 files changed, 67 insertions(+), 91 deletions(-) -- 2.17.1

2 12

[libvirt] [PATCH 0/5] Unify check for auth and auth->cb
by Marcos Paulo de Souza 14 Aug '18

14 Aug '18

Hi guys, in some drivers, auth and auth->cb are checked in connectOpen function, while in xenapi, only auth is checked, which that could lead to a problem if cb if invalid. In phyp, auth and auth->cb are checked twice, in getUser and getPassword. So, this patchset adds the check for auth and auth->cb inside virAuthGetUsername and virAuthGetPassword, making it safer for all drivers that rely in auth callbacks. Marcos Paulo de Souza (5): virauth.c: Check for valid auth callback esx: Drop check for auth and auth->cb hyperv: Drop check for auth and auth->cb phyp: Drop check for auth and auth->cb xenapi: Drop check for auth src/esx/esx_driver.c | 7 ------- src/hyperv/hyperv_driver.c | 7 ------- src/phyp/phyp_driver.c | 11 ----------- src/util/virauth.c | 12 ++++++++++++ src/xenapi/xenapi_driver.c | 6 ------ 5 files changed, 12 insertions(+), 31 deletions(-) -- 2.17.1

3 8

[libvirt] [PATCH] news: Add support for MBA (Memory Bandwidth Allocation)
by bing.niu＠intel.com 14 Aug '18

14 Aug '18

From: Bing Niu <bing.niu(a)intel.com> Signed-off-by: Bing Niu <bing.niu(a)intel.com> --- docs/news.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 2f0c010..c6d03f5 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -44,6 +44,15 @@ iscsiadm. It support basic pool operations: checkPool and refreshPool. </description> </change> + <change> + <summary> + Add support for MBA (Memory Bandwidth Allocation technology) + </summary> + <description> + Domain vCPU threads can now have allocated some parts of host memory + bandwidth by using the <code>memorytune</code> element in <code>cputune</code>. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.7.4

2 1

[libvirt] [jenkins-ci PATCH 0/2] Run 'make syntax-check' for libvirt-dbus
by Andrea Bolognani 14 Aug '18

14 Aug '18

This requires https://www.redhat.com/archives/libvir-list/2018-August/msg00863.html to be merged first. Andrea Bolognani (2): guests: Install flake8 for libvirt-dbus projects: Run 'make syntax-check' for libvirt-dbus guests/vars/mappings.yml | 7 +++++++ guests/vars/projects/libvirt-dbus.yml | 1 + projects/libvirt-dbus.yaml | 11 ++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) -- 2.17.1

2 3

[libvirt] [dbus PATCH 0/3] Fix and improve syntax-check
by Andrea Bolognani 14 Aug '18

14 Aug '18

Andrea Bolognani (3): tests: Point flake8 to the files it needs to check configure: Detect flake8 automatically configure: Find flake8 on FreeBSD Makefile.am | 2 +- configure.ac | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- 2.17.1

3 6

[libvirt] [dbus PATCH 0/2] configure: Various fixes
by Andrea Bolognani 14 Aug '18

14 Aug '18

Andrea Bolognani (2): configure: Fix quoting configure: Call PKG_CHECK_MODULES() correctly configure.ac | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) -- 2.17.1

2 3

[libvirt] [dbus PATCH] tests: Remove unused import
by Andrea Bolognani 14 Aug '18

14 Aug '18

This fixes 'make syntax-check'. The issue was introduced by commit 7da2b425a8cc. Reported-by: Ján Tomko <jtomko(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/test_nodedev.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_nodedev.py b/tests/test_nodedev.py index 082cf0b..5c8206e 100755 --- a/tests/test_nodedev.py +++ b/tests/test_nodedev.py @@ -2,7 +2,6 @@ import dbus import libvirttest -import pytest class TestNodeDevice(libvirttest.BaseTestClass): -- 2.17.1

2 1

[libvirt] [dbus PATCH 0/4] Fix 'make check' with libvirt 3.0.0
by Andrea Bolognani 14 Aug '18

14 Aug '18

Andrea Bolognani (4): tests: Drop pytest.mark.usefixtures from test_nodedev tests: Move some test cases to test_nodedev tests: Don't open-code node_device_create() tests: Make node_device_create() work with libvirt 3.0.0 tests/libvirttest.py | 17 ++++++++++++++++- tests/test_connect.py | 27 --------------------------- tests/test_nodedev.py | 26 +++++++++++++++++++++++++- tests/xmldata.py | 2 +- 4 files changed, 42 insertions(+), 30 deletions(-) -- 2.17.1

3 8

[libvirt] [jenkins-ci PATCH] guests: Install libiscsi for libvirt
by Andrea Bolognani 14 Aug '18

14 Aug '18

Since libvirt commit 34a6962c41b4 it's required to successfully build the RPM packages. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/vars/mappings.yml | 4 ++++ guests/vars/projects/libvirt.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index b2d63c9..21948fb 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -239,6 +239,10 @@ mappings: Debian: libgovirt-dev Debian8: + libiscsi: + deb: libiscsi-dev + rpm: libiscsi-devel + libnl3: deb: libnl-3-dev rpm: libnl3-devel diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml index 3274564..605d201 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -22,6 +22,7 @@ packages: - libcap-ng - libcurl - libdbus + - libiscsi - libnl3 - libnlroute3 - libnuma -- 2.17.1

2 1

[libvirt] [PATCH v2] libvirt_iohelper: record the libvirt_iohelper's error message at virFileWrapperFdFree
by xinhua.Cao 14 Aug '18

14 Aug '18

Currently iohelper's error log is recorded in virFileWrapperFdClose. In qemuDomainSaveMemory, it usually fails at qemuMigrationSrcToFile, and then goto cleanup, so the iohelper error log is not recorded, and so is the another placement. We now record the error log of iohelper by move it to the virFileWrapperFdFree record. And for the virCommandWait() - we should call virCommandAbort() in virFileWrapperFdFree() to make sure no process is left behind. If virCommandWait() is called then virCommandAbort() is a NO-OP. If it isn't, then Abort() will kill iohelper. Thanks for Michal for this advice Signed-off-by: xinhua.Cao <caoxinhua(a)huawei.com> --- src/util/virfile.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 1faeebb..590fc0e 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -330,9 +330,6 @@ virFileWrapperFdClose(virFileWrapperFdPtr wfd) return 0; ret = virCommandWait(wfd->cmd, NULL); - if (wfd->err_msg && *wfd->err_msg) - VIR_WARN("iohelper reports: %s", wfd->err_msg); - return ret; } @@ -351,6 +348,10 @@ virFileWrapperFdFree(virFileWrapperFdPtr wfd) if (!wfd) return; + if (wfd->err_msg && *wfd->err_msg) + VIR_WARN("iohelper reports: %s", wfd->err_msg); + + virCommandAbort(wfd->cmd); VIR_FREE(wfd->err_msg); virCommandFree(wfd->cmd); -- 2.8.3

2 1

[libvirt] [PATCH 0/7] Remove arbitrary limit on socket_id/core_id
by Andrea Bolognani 14 Aug '18

14 Aug '18

See patch 6 for the explanation; the previous 5 patches are cleanups. I had to snip out some patches to comply with the message size limit for the list - ironic, I know. The full commits can be fetched from https://github.com/andreabolognani/libvirt/tree/high-ids Andrea Bolognani (7): util: Drop VIR_HOST_CPU_MASK_LEN tests: Drop unused data tests: Add missing thread_siblings_list files util: Rewrite virHostCPUCountThreadSiblings() tests: Drop core_siblings/thread_siblings files utils: Remove arbitrary limit on socket_id/core_id tests: Add linux-high-ids test src/util/virhostcpu.c | 69 +++------ .../system/cpu/cpu0/topology/core_siblings | 1 - .../system/cpu/cpu1/topology/core_siblings | 1 - .../system/cpu/cpu1/topology/thread_siblings | 1 - .../system/cpu/cpu10/topology/core_siblings | 1 - .../system/cpu/cpu10/topology/thread_siblings | 1 - .../system/cpu/cpu11/topology/core_siblings | 1 - .../system/cpu/cpu11/topology/thread_siblings | 1 - .../system/cpu/cpu12/topology/core_siblings | 1 - .../system/cpu/cpu12/topology/thread_siblings | 1 - .../system/cpu/cpu13/topology/core_siblings | 1 - .../system/cpu/cpu13/topology/thread_siblings | 1 - .../system/cpu/cpu14/topology/core_siblings | 1 - .../system/cpu/cpu14/topology/thread_siblings | 1 - .../system/cpu/cpu15/topology/core_siblings | 1 - .../system/cpu/cpu15/topology/thread_siblings | 1 - .../system/cpu/cpu2/topology/core_siblings | 1 - .../system/cpu/cpu2/topology/thread_siblings | 1 - .../system/cpu/cpu3/topology/core_siblings | 1 - .../system/cpu/cpu3/topology/thread_siblings | 1 - .../system/cpu/cpu4/topology/core_siblings | 1 - .../system/cpu/cpu4/topology/thread_siblings | 1 - .../system/cpu/cpu5/topology/core_siblings | 1 - .../system/cpu/cpu5/topology/thread_siblings | 1 - .../system/cpu/cpu6/topology/core_siblings | 1 - .../system/cpu/cpu6/topology/thread_siblings | 1 - .../system/cpu/cpu7/topology/core_siblings | 1 - .../system/cpu/cpu7/topology/thread_siblings | 1 - .../system/cpu/cpu8/topology/core_siblings | 1 - .../system/cpu/cpu8/topology/thread_siblings | 1 - .../system/cpu/cpu9/topology/core_siblings | 1 - .../system/cpu/cpu9/topology/thread_siblings | 1 - .../system/cpu/cpu0/topology/core_siblings | 1 - .../system/cpu/cpu0/topology/thread_siblings | 1 - .../system/cpu/cpu1/topology/core_siblings | 1 - .../system/cpu/cpu1/topology/thread_siblings | 1 - .../system/cpu/cpu2/topology/core_siblings | 1 - .../system/cpu/cpu2/topology/thread_siblings | 1 - .../system/cpu/cpu3/topology/core_siblings | 1 - .../system/cpu/cpu3/topology/thread_siblings | 1 - .../system/cpu/cpu4/topology/core_siblings | 1 - .../system/cpu/cpu4/topology/thread_siblings | 1 - .../system/cpu/cpu5/topology/core_siblings | 1 - .../system/cpu/cpu5/topology/thread_siblings | 1 - .../system/cpu/cpu6/topology/core_siblings | 1 - .../system/cpu/cpu6/topology/thread_siblings | 1 - .../system/cpu/cpu7/topology/core_siblings | 1 - .../system/cpu/cpu7/topology/thread_siblings | 1 - .../system/cpu/cpu0/topology/core_siblings | 1 - .../system/cpu/cpu0/topology/thread_siblings | 1 - .../system/cpu/cpu0/topology/core_siblings | 1 - .../system/cpu/cpu0/topology/thread_siblings | 1 - .../system/cpu/cpu0/topology/core_siblings | 1 - .../system/cpu/cpu0/topology/thread_siblings | 1 - .../system/cpu/cpu1/topology/core_siblings | 1 - .../system/cpu/cpu1/topology/thread_siblings | 1 - .../system/cpu/cpu10/topology/core_siblings | 1 - .../system/cpu/cpu10/topology/thread_siblings | 1 - .../system/cpu/cpu11/topology/core_siblings | 1 - .../system/cpu/cpu11/topology/thread_siblings | 1 - .../system/cpu/cpu2/topology/core_siblings | 1 - .../system/cpu/cpu2/topology/thread_siblings | 1 - .../system/cpu/cpu3/topology/core_siblings | 1 - .../system/cpu/cpu3/topology/thread_siblings | 1 - .../system/cpu/cpu4/topology/core_siblings | 1 - .../system/cpu/cpu4/topology/thread_siblings | 1 - .../system/cpu/cpu5/topology/core_siblings | 1 - .../system/cpu/cpu5/topology/thread_siblings | 1 - .../system/cpu/cpu6/topology/core_siblings | 1 - .../system/cpu/cpu6/topology/thread_siblings | 1 - .../system/cpu/cpu7/topology/core_siblings | 1 - .../system/cpu/cpu7/topology/thread_siblings | 1 - .../system/cpu/cpu8/topology/core_siblings | 1 - .../system/cpu/cpu8/topology/thread_siblings | 1 - .../system/cpu/cpu9/topology/core_siblings | 1 - .../system/cpu/cpu9/topology/thread_siblings | 1 - .../linux-aarch64-high-ids.cpuinfo | 143 ++++++++++++++++++ .../linux-aarch64-high-ids.expected | 1 + .../virhostcpudata/linux-caches1/cpu/offline | 1 - .../cpu/cpu104/topology/core_siblings | 1 - .../cpu/cpu104/topology/thread_siblings | 1 - .../cpu/cpu112/topology/core_siblings | 1 - .../cpu/cpu112/topology/thread_siblings | 1 - .../cpu/cpu120/topology/core_siblings | 1 - .../cpu/cpu120/topology/thread_siblings | 1 - .../cpu/cpu128/topology/core_siblings | 1 - .../cpu/cpu128/topology/thread_siblings | 1 - .../cpu/cpu136/topology/core_siblings | 1 - .../cpu/cpu136/topology/thread_siblings | 1 - .../cpu/cpu16/topology/core_siblings | 1 - .../cpu/cpu16/topology/thread_siblings | 1 - .../cpu/cpu24/topology/core_siblings | 1 - .../cpu/cpu24/topology/thread_siblings | 1 - .../cpu/cpu40/topology/core_siblings | 1 - .../cpu/cpu40/topology/thread_siblings | 1 - .../cpu/cpu48/topology/core_siblings | 1 - .../cpu/cpu48/topology/thread_siblings | 1 - .../cpu/cpu72/topology/core_siblings | 1 - .../cpu/cpu72/topology/thread_siblings | 1 - .../cpu/cpu0/topology/core_siblings | 1 - .../cpu/cpu0/topology/thread_siblings | 1 - .../cpu/cpu1/topology/core_siblings | 1 - .../cpu/cpu1/topology/thread_siblings | 1 - .../cpu/cpu2/topology/core_siblings | 1 - .../cpu/cpu2/topology/thread_siblings | 1 - .../cpu/cpu3/topology/core_siblings | 1 - .../cpu/cpu3/topology/thread_siblings | 1 - .../cpu/cpu4/topology/core_siblings | 1 - .../cpu/cpu4/topology/thread_siblings | 1 - .../cpu/cpu5/topology/core_siblings | 1 - .../cpu/cpu5/topology/thread_siblings | 1 - .../cpu/cpu6/topology/core_siblings | 1 - .../cpu/cpu6/topology/thread_siblings | 1 - .../cpu/cpu7/topology/core_siblings | 1 - .../cpu/cpu7/topology/thread_siblings | 1 - .../linux-high-ids/cpu/cpu0/online} | 0 .../linux-high-ids/cpu/cpu0/topology/core_id | 1 + .../cpu/cpu0/topology/core_siblings_list | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../cpu/cpu0/topology/thread_siblings_list | 1 + .../cpu/cpu1/online} | 0 .../linux-high-ids/cpu/cpu1/topology/core_id | 1 + .../cpu/cpu1/topology/core_siblings_list | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../cpu/cpu1/topology/thread_siblings_list | 1 + .../cpu/cpu10/online} | 0 .../linux-high-ids/cpu/cpu10/topology/core_id | 1 + .../cpu/cpu10/topology/core_siblings_list | 1 + .../cpu/cpu10/topology/physical_package_id | 1 + .../cpu/cpu10/topology/thread_siblings_list | 1 + .../linux-high-ids/cpu/cpu11/online} | 0 .../linux-high-ids/cpu/cpu11/topology/core_id | 1 + .../cpu/cpu11/topology/core_siblings_list | 1 + .../cpu/cpu11/topology/physical_package_id | 1 + .../cpu/cpu11/topology/thread_siblings_list | 1 + .../linux-high-ids/cpu/cpu12/online} | 0 .../linux-high-ids/cpu/cpu12/topology/core_id | 1 + .../cpu/cpu12/topology/core_siblings_list | 1 + .../cpu/cpu12/topology/physical_package_id | 1 + .../cpu/cpu12/topology/thread_siblings_list | 1 + .../linux-high-ids/cpu/cpu13/online} | 0 .../linux-high-ids/cpu/cpu13/topology/core_id | 1 + .../cpu/cpu13/topology/core_siblings_list | 1 + .../cpu/cpu13/topology/physical_package_id | 1 + .../cpu/cpu13/topology/thread_siblings_list | 1 + .../linux-high-ids/cpu/cpu14/online} | 0 .../linux-high-ids/cpu/cpu14/topology/core_id | 1 + .../cpu/cpu14/topology/core_siblings_list | 1 + .../cpu/cpu14/topology/physical_package_id | 1 + .../cpu/cpu14/topology/thread_siblings_list | 1 + .../linux-high-ids/cpu/cpu15/online} | 0 .../linux-high-ids/cpu/cpu15/topology/core_id | 1 + .../cpu/cpu15/topology/core_siblings_list | 1 + .../cpu/cpu15/topology/physical_package_id | 1 + .../cpu/cpu15/topology/thread_siblings_list | 1 + .../linux-high-ids/cpu/cpu2/online} | 0 .../linux-high-ids/cpu/cpu2/topology/core_id | 1 + .../cpu/cpu2/topology/core_siblings_list | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../cpu/cpu2/topology/thread_siblings_list | 1 + .../linux-high-ids/cpu/cpu3/online} | 0 .../linux-high-ids/cpu/cpu3/topology/core_id | 1 + .../cpu/cpu3/topology/core_siblings_list | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../cpu/cpu3/topology/thread_siblings_list | 1 + .../linux-high-ids/cpu/cpu4/online} | 0 .../linux-high-ids/cpu/cpu4/topology/core_id | 1 + .../cpu/cpu4/topology/core_siblings_list | 1 + .../cpu/cpu4/topology/physical_package_id | 1 + .../cpu/cpu4/topology/thread_siblings_list | 1 + .../linux-high-ids/cpu/cpu5/online} | 0 .../linux-high-ids/cpu/cpu5/topology/core_id | 1 + .../cpu/cpu5/topology/core_siblings_list | 1 + .../cpu/cpu5/topology/physical_package_id | 1 + .../cpu/cpu5/topology/thread_siblings_list | 1 + .../linux-high-ids/cpu/cpu6/online} | 0 .../linux-high-ids/cpu/cpu6/topology/core_id | 1 + .../cpu/cpu6/topology/core_siblings_list | 1 + .../cpu/cpu6/topology/physical_package_id | 1 + .../cpu/cpu6/topology/thread_siblings_list | 1 + .../linux-high-ids/cpu/cpu7/online} | 0 .../linux-high-ids/cpu/cpu7/topology/core_id | 1 + .../cpu/cpu7/topology/core_siblings_list | 1 + .../cpu/cpu7/topology/physical_package_id | 1 + .../cpu/cpu7/topology/thread_siblings_list | 1 + .../linux-high-ids/cpu/cpu8/online} | 0 .../linux-high-ids/cpu/cpu8/topology/core_id | 1 + .../cpu/cpu8/topology/core_siblings_list | 1 + .../cpu/cpu8/topology/physical_package_id | 1 + .../cpu/cpu8/topology/thread_siblings_list | 1 + .../linux-high-ids/cpu/cpu9/online} | 0 .../linux-high-ids/cpu/cpu9/topology/core_id | 1 + .../cpu/cpu9/topology/core_siblings_list | 1 + .../cpu/cpu9/topology/physical_package_id | 1 + .../cpu/cpu9/topology/thread_siblings_list | 1 + .../virhostcpudata/linux-high-ids/cpu/online | 1 + .../virhostcpudata/linux-high-ids/cpu/present | 1 + .../linux-high-ids/node/node0/cpu0 | 1 + .../linux-high-ids/node/node0/cpu1 | 1 + .../linux-high-ids/node/node0/cpu2 | 1 + .../linux-high-ids/node/node0/cpu3 | 1 + .../linux-high-ids/node/node0/cpu4 | 1 + .../linux-high-ids/node/node0/cpu5 | 1 + .../linux-high-ids/node/node0/cpu6 | 1 + .../linux-high-ids/node/node0/cpu7 | 1 + .../node/node0/cpulist} | 0 .../linux-high-ids/node/node1/cpu10 | 1 + .../linux-high-ids/node/node1/cpu11 | 1 + .../linux-high-ids/node/node1/cpu12 | 1 + .../linux-high-ids/node/node1/cpu13 | 1 + .../linux-high-ids/node/node1/cpu14 | 1 + .../linux-high-ids/node/node1/cpu15 | 1 + .../linux-high-ids/node/node1/cpu8 | 1 + .../linux-high-ids/node/node1/cpu9 | 1 + .../linux-high-ids/node/node1/cpulist | 1 + .../cpu/cpu0/topology/core_siblings | 1 - .../cpu/cpu0/topology/thread_siblings | 1 - .../cpu/cpu1/topology/core_siblings | 1 - .../cpu/cpu1/topology/thread_siblings | 1 - .../cpu/cpu2/topology/core_siblings | 1 - .../cpu/cpu2/topology/thread_siblings | 1 - .../cpu/cpu3/topology/core_siblings | 1 - .../cpu/cpu3/topology/thread_siblings | 1 - .../cpu/cpu4/topology/core_siblings | 1 - .../cpu/cpu4/topology/thread_siblings | 1 - .../cpu/cpu5/topology/core_siblings | 1 - .../cpu/cpu5/topology/thread_siblings | 1 - .../cpu/cpu6/topology/core_siblings | 1 - .../cpu/cpu6/topology/thread_siblings | 1 - .../cpu/cpu7/topology/core_siblings | 1 - .../cpu/cpu7/topology/thread_siblings | 1 - .../cpu/cpu0/topology/core_siblings | 1 - .../cpu/cpu0/topology/thread_siblings | 1 - .../cpu/cpu1/topology/core_siblings | 1 - .../cpu/cpu1/topology/thread_siblings | 1 - .../cpu/cpu2/topology/core_siblings | 1 - .../cpu/cpu2/topology/thread_siblings | 1 - .../cpu/cpu3/topology/core_siblings | 1 - .../cpu/cpu3/topology/thread_siblings | 1 - .../cpu/cpu4/topology/core_siblings | 1 - .../cpu/cpu4/topology/thread_siblings | 1 - .../cpu/cpu5/topology/core_siblings | 1 - .../cpu/cpu5/topology/thread_siblings | 1 - .../cpu/cpu6/topology/core_siblings | 1 - .../cpu/cpu6/topology/thread_siblings | 1 - .../cpu/cpu7/topology/core_siblings | 1 - .../cpu/cpu7/topology/thread_siblings | 1 - .../cpu/cpu0/topology/core_siblings | 1 - .../cpu/cpu0/topology/thread_siblings | 1 - .../cpu/cpu104/topology/core_siblings | 1 - .../cpu/cpu104/topology/thread_siblings | 1 - .../cpu/cpu112/topology/core_siblings | 1 - .../cpu/cpu112/topology/thread_siblings | 1 - .../cpu/cpu120/topology/core_siblings | 1 - .../cpu/cpu120/topology/thread_siblings | 1 - .../cpu/cpu128/topology/core_siblings | 1 - .../cpu/cpu128/topology/thread_siblings | 1 - .../cpu/cpu136/topology/core_siblings | 1 - .../cpu/cpu136/topology/thread_siblings | 1 - .../cpu/cpu144/topology/core_siblings | 1 - .../cpu/cpu144/topology/thread_siblings | 1 - .../cpu/cpu152/topology/core_siblings | 1 - .../cpu/cpu152/topology/thread_siblings | 1 - .../cpu/cpu16/topology/core_siblings | 1 - .../cpu/cpu16/topology/thread_siblings | 1 - .../cpu/cpu24/topology/core_siblings | 1 - .../cpu/cpu24/topology/thread_siblings | 1 - .../cpu/cpu32/topology/core_siblings | 1 - .../cpu/cpu32/topology/thread_siblings | 1 - .../cpu/cpu40/topology/core_siblings | 1 - .../cpu/cpu40/topology/thread_siblings | 1 - .../cpu/cpu48/topology/core_siblings | 1 - .../cpu/cpu48/topology/thread_siblings | 1 - .../cpu/cpu56/topology/core_siblings | 1 - .../cpu/cpu56/topology/thread_siblings | 1 - .../cpu/cpu64/topology/core_siblings | 1 - .../cpu/cpu64/topology/thread_siblings | 1 - .../cpu/cpu72/topology/core_siblings | 1 - .../cpu/cpu72/topology/thread_siblings | 1 - .../cpu/cpu8/topology/core_siblings | 1 - .../cpu/cpu8/topology/thread_siblings | 1 - .../cpu/cpu80/topology/core_siblings | 1 - .../cpu/cpu80/topology/thread_siblings | 1 - .../cpu/cpu88/topology/core_siblings | 1 - .../cpu/cpu88/topology/thread_siblings | 1 - .../cpu/cpu96/topology/core_siblings | 1 - .../cpu/cpu96/topology/thread_siblings | 1 - .../cpu/cpu0/topology/core_siblings | 1 - .../cpu/cpu0/topology/thread_siblings | 1 - .../cpu/cpu104/topology/core_siblings | 1 - .../cpu/cpu104/topology/thread_siblings | 1 - .../cpu/cpu112/topology/core_siblings | 1 - .../cpu/cpu112/topology/thread_siblings | 1 - .../cpu/cpu128/topology/core_siblings | 1 - .../cpu/cpu128/topology/thread_siblings | 1 - .../cpu/cpu136/topology/core_siblings | 1 - .../cpu/cpu136/topology/thread_siblings | 1 - .../cpu/cpu16/topology/core_siblings | 1 - .../cpu/cpu16/topology/thread_siblings | 1 - .../cpu/cpu24/topology/core_siblings | 1 - .../cpu/cpu24/topology/thread_siblings | 1 - .../cpu/cpu32/topology/core_siblings | 1 - .../cpu/cpu32/topology/thread_siblings | 1 - .../cpu/cpu40/topology/core_siblings | 1 - .../cpu/cpu40/topology/thread_siblings | 1 - .../cpu/cpu48/topology/core_siblings | 1 - .../cpu/cpu48/topology/thread_siblings | 1 - .../cpu/cpu56/topology/core_siblings | 1 - .../cpu/cpu56/topology/thread_siblings | 1 - .../cpu/cpu72/topology/core_siblings | 1 - .../cpu/cpu72/topology/thread_siblings | 1 - .../cpu/cpu8/topology/core_siblings | 1 - .../cpu/cpu8/topology/thread_siblings | 1 - .../cpu/cpu80/topology/core_siblings | 1 - .../cpu/cpu80/topology/thread_siblings | 1 - .../cpu/cpu88/topology/core_siblings | 1 - .../cpu/cpu88/topology/thread_siblings | 1 - .../cpu/cpu96/topology/core_siblings | 1 - .../cpu/cpu96/topology/thread_siblings | 1 - .../cpu/cpu104/topology/core_siblings | 1 - .../cpu/cpu104/topology/thread_siblings | 1 - .../cpu/cpu112/topology/core_siblings | 1 - .../cpu/cpu112/topology/thread_siblings | 1 - .../cpu/cpu128/topology/core_siblings | 1 - .../cpu/cpu128/topology/thread_siblings | 1 - .../cpu/cpu136/topology/core_siblings | 1 - .../cpu/cpu136/topology/thread_siblings | 1 - .../cpu/cpu152/topology/core_siblings | 1 - .../cpu/cpu152/topology/thread_siblings | 1 - .../cpu/cpu153/topology/core_siblings | 1 - .../cpu/cpu153/topology/thread_siblings | 1 - .../cpu/cpu154/topology/core_siblings | 1 - .../cpu/cpu154/topology/thread_siblings | 1 - .../cpu/cpu155/topology/core_siblings | 1 - .../cpu/cpu155/topology/thread_siblings | 1 - .../cpu/cpu156/topology/core_siblings | 1 - .../cpu/cpu156/topology/thread_siblings | 1 - .../cpu/cpu157/topology/core_siblings | 1 - .../cpu/cpu157/topology/thread_siblings | 1 - .../cpu/cpu158/topology/core_siblings | 1 - .../cpu/cpu158/topology/thread_siblings | 1 - .../cpu/cpu159/topology/core_siblings | 1 - .../cpu/cpu159/topology/thread_siblings | 1 - .../cpu/cpu40/topology/core_siblings | 1 - .../cpu/cpu40/topology/thread_siblings | 1 - .../cpu/cpu48/topology/core_siblings | 1 - .../cpu/cpu48/topology/thread_siblings | 1 - .../cpu/cpu56/topology/core_siblings | 1 - .../cpu/cpu56/topology/thread_siblings | 1 - .../cpu/cpu68/topology/core_siblings | 1 - .../cpu/cpu68/topology/thread_siblings | 1 - .../cpu/cpu72/topology/core_siblings | 1 - .../cpu/cpu72/topology/thread_siblings | 1 - .../cpu/cpu8/topology/core_siblings | 1 - .../cpu/cpu8/topology/thread_siblings | 1 - .../cpu/cpu80/topology/core_siblings | 1 - .../cpu/cpu80/topology/thread_siblings | 1 - .../cpu/cpu88/topology/core_siblings | 1 - .../cpu/cpu88/topology/thread_siblings | 1 - .../cpu/cpu96/topology/core_siblings | 1 - .../cpu/cpu96/topology/thread_siblings | 1 - .../cpu/cpu0/topology/core_siblings | 1 - .../cpu/cpu0/topology/thread_siblings | 1 - .../linux-test1/cpu/cpu1/core_siblings | 1 - .../linux-test1/cpu/cpu1/thread_siblings | 1 - .../cpu/cpu1/topology/core_siblings | 1 - .../cpu/cpu1/topology/thread_siblings | 1 - .../cpu/cpu0/topology/core_siblings | 1 - .../cpu/cpu0/topology/thread_siblings | 1 - .../cpu/cpu1/topology/core_siblings | 1 - .../cpu/cpu1/topology/thread_siblings | 1 - .../cpu/cpu0/topology/thread_siblings | 1 - .../cpu/cpu1/topology/thread_siblings | 1 - .../cpu/cpu10/topology/thread_siblings | 1 - .../cpu/cpu11/topology/thread_siblings | 1 - .../cpu/cpu12/topology/thread_siblings | 1 - .../cpu/cpu13/topology/thread_siblings | 1 - .../cpu/cpu14/topology/thread_siblings | 1 - .../cpu/cpu15/topology/thread_siblings | 1 - .../cpu/cpu16/topology/thread_siblings | 1 - .../cpu/cpu17/topology/thread_siblings | 1 - .../cpu/cpu18/topology/thread_siblings | 1 - .../cpu/cpu19/topology/thread_siblings | 1 - .../cpu/cpu2/topology/thread_siblings | 1 - .../cpu/cpu20/topology/thread_siblings | 1 - .../cpu/cpu21/topology/thread_siblings | 1 - .../cpu/cpu22/topology/thread_siblings | 1 - .../cpu/cpu23/topology/thread_siblings | 1 - .../cpu/cpu24/topology/thread_siblings | 1 - .../cpu/cpu25/topology/thread_siblings | 1 - .../cpu/cpu26/topology/thread_siblings | 1 - .../cpu/cpu27/topology/thread_siblings | 1 - .../cpu/cpu28/topology/thread_siblings | 1 - .../cpu/cpu29/topology/thread_siblings | 1 - .../cpu/cpu3/topology/thread_siblings | 1 - .../cpu/cpu30/topology/thread_siblings | 1 - .../cpu/cpu31/topology/thread_siblings | 1 - .../cpu/cpu32/topology/thread_siblings | 1 - .../cpu/cpu33/topology/thread_siblings | 1 - .../cpu/cpu34/topology/thread_siblings | 1 - .../cpu/cpu35/topology/thread_siblings | 1 - .../cpu/cpu36/topology/thread_siblings | 1 - .../cpu/cpu37/topology/thread_siblings | 1 - .../cpu/cpu38/topology/thread_siblings | 1 - .../cpu/cpu39/topology/thread_siblings | 1 - .../cpu/cpu4/topology/thread_siblings | 1 - .../cpu/cpu40/topology/thread_siblings | 1 - .../cpu/cpu41/topology/thread_siblings | 1 - .../cpu/cpu42/topology/thread_siblings | 1 - .../cpu/cpu43/topology/thread_siblings | 1 - .../cpu/cpu44/topology/thread_siblings | 1 - .../cpu/cpu45/topology/thread_siblings | 1 - .../cpu/cpu46/topology/thread_siblings | 1 - .../cpu/cpu47/topology/thread_siblings | 1 - .../cpu/cpu5/topology/thread_siblings | 1 - .../cpu/cpu6/topology/thread_siblings | 1 - .../cpu/cpu7/topology/thread_siblings | 1 - .../cpu/cpu8/topology/thread_siblings | 1 - .../cpu/cpu9/topology/thread_siblings | 1 - .../cpu/cpu0/topology/thread_siblings | 1 - .../cpu/cpu1/topology/thread_siblings | 1 - .../cpu/cpu10/topology/thread_siblings | 1 - .../cpu/cpu11/topology/thread_siblings | 1 - .../cpu/cpu12/topology/thread_siblings | 1 - .../cpu/cpu13/topology/thread_siblings | 1 - .../cpu/cpu14/topology/thread_siblings | 1 - .../cpu/cpu15/topology/thread_siblings | 1 - .../cpu/cpu2/topology/thread_siblings | 1 - .../cpu/cpu3/topology/thread_siblings | 1 - .../cpu/cpu4/topology/thread_siblings | 1 - .../cpu/cpu5/topology/thread_siblings | 1 - .../cpu/cpu6/topology/thread_siblings | 1 - .../cpu/cpu7/topology/thread_siblings | 1 - .../cpu/cpu8/topology/thread_siblings | 1 - .../cpu/cpu9/topology/thread_siblings | 1 - .../cpu/cpu0/topology/core_siblings | 1 - .../cpu/cpu0/topology/thread_siblings | 1 - .../cpu/cpu1/topology/core_siblings | 1 - .../cpu/cpu1/topology/thread_siblings | 1 - .../cpu/cpu2/topology/core_siblings | 1 - .../cpu/cpu2/topology/thread_siblings | 1 - .../cpu/cpu3/topology/core_siblings | 1 - .../cpu/cpu3/topology/thread_siblings | 1 - .../cpu/cpu0/topology/thread_siblings | 1 - .../cpu/cpu0/topology/thread_siblings_list | 1 + .../cpu/cpu1/topology/thread_siblings | 1 - .../cpu/cpu1/topology/thread_siblings_list} | 0 .../cpu/cpu2/topology/thread_siblings | 1 - .../cpu/cpu2/topology/thread_siblings_list | 1 + .../cpu/cpu3/topology/thread_siblings | 1 - .../cpu/cpu3/topology/thread_siblings_list | 1 + .../cpu/cpu4/topology/thread_siblings | 1 - .../cpu/cpu4/topology/thread_siblings_list | 1 + .../cpu/cpu6/topology/thread_siblings | 1 - .../cpu/cpu6/topology/thread_siblings_list | 1 + .../cpu/cpu0/topology/thread_siblings | 1 - .../cpu/cpu1/topology/thread_siblings | 1 - .../cpu/cpu10/topology/thread_siblings | 1 - .../cpu/cpu11/topology/thread_siblings | 1 - .../cpu/cpu12/topology/thread_siblings | 1 - .../cpu/cpu13/topology/thread_siblings | 1 - .../cpu/cpu14/topology/thread_siblings | 1 - .../cpu/cpu15/topology/thread_siblings | 1 - .../cpu/cpu16/topology/thread_siblings | 1 - .../cpu/cpu17/topology/thread_siblings | 1 - .../cpu/cpu18/topology/thread_siblings | 1 - .../cpu/cpu19/topology/thread_siblings | 1 - .../cpu/cpu2/topology/thread_siblings | 1 - .../cpu/cpu20/topology/thread_siblings | 1 - .../cpu/cpu21/topology/thread_siblings | 1 - .../cpu/cpu22/topology/thread_siblings | 1 - .../cpu/cpu23/topology/thread_siblings | 1 - .../cpu/cpu3/topology/thread_siblings | 1 - .../cpu/cpu4/topology/thread_siblings | 1 - .../cpu/cpu5/topology/thread_siblings | 1 - .../cpu/cpu6/topology/thread_siblings | 1 - .../cpu/cpu7/topology/thread_siblings | 1 - .../cpu/cpu8/topology/thread_siblings | 1 - .../cpu/cpu9/topology/thread_siblings | 1 - .../cpu/cpu0/topology/thread_siblings | 1 - .../cpu/cpu0/topology/thread_siblings_list | 1 + .../cpu/cpu1/topology/thread_siblings | 1 - .../cpu/cpu1/topology/thread_siblings_list | 1 + .../cpu/cpu10/topology/thread_siblings | 1 - .../cpu/cpu10/topology/thread_siblings_list | 1 + .../cpu/cpu11/topology/thread_siblings | 1 - .../cpu/cpu11/topology/thread_siblings_list | 1 + .../cpu/cpu12/topology/thread_siblings | 1 - .../cpu/cpu12/topology/thread_siblings_list | 1 + .../cpu/cpu13/topology/thread_siblings | 1 - .../cpu/cpu13/topology/thread_siblings_list | 1 + .../cpu/cpu14/topology/thread_siblings | 1 - .../cpu/cpu14/topology/thread_siblings_list | 1 + .../cpu/cpu15/topology/thread_siblings | 1 - .../cpu/cpu15/topology/thread_siblings_list | 1 + .../cpu/cpu16/topology/thread_siblings | 1 - .../cpu/cpu16/topology/thread_siblings_list | 1 + .../cpu/cpu17/topology/thread_siblings | 1 - .../cpu/cpu17/topology/thread_siblings_list | 1 + .../cpu/cpu18/topology/thread_siblings | 1 - .../cpu/cpu18/topology/thread_siblings_list | 1 + .../cpu/cpu19/topology/thread_siblings | 1 - .../cpu/cpu19/topology/thread_siblings_list | 1 + .../cpu/cpu2/topology/thread_siblings | 1 - .../cpu/cpu2/topology/thread_siblings_list | 1 + .../cpu/cpu20/topology/thread_siblings | 1 - .../cpu/cpu20/topology/thread_siblings_list | 1 + .../cpu/cpu21/topology/thread_siblings | 1 - .../cpu/cpu21/topology/thread_siblings_list | 1 + .../cpu/cpu22/topology/thread_siblings | 1 - .../cpu/cpu22/topology/thread_siblings_list | 1 + .../cpu/cpu23/topology/thread_siblings | 1 - .../cpu/cpu23/topology/thread_siblings_list | 1 + .../cpu/cpu24/topology/thread_siblings | 1 - .../cpu/cpu24/topology/thread_siblings_list | 1 + .../cpu/cpu25/topology/thread_siblings | 1 - .../cpu/cpu25/topology/thread_siblings_list | 1 + .../cpu/cpu26/topology/thread_siblings | 1 - .../cpu/cpu26/topology/thread_siblings_list | 1 + .../cpu/cpu27/topology/thread_siblings | 1 - .../cpu/cpu27/topology/thread_siblings_list | 1 + .../cpu/cpu28/topology/thread_siblings | 1 - .../cpu/cpu28/topology/thread_siblings_list | 1 + .../cpu/cpu29/topology/thread_siblings | 1 - .../cpu/cpu29/topology/thread_siblings_list | 1 + .../cpu/cpu3/topology/thread_siblings | 1 - .../cpu/cpu3/topology/thread_siblings_list | 1 + .../cpu/cpu30/topology/thread_siblings | 1 - .../cpu/cpu30/topology/thread_siblings_list | 1 + .../cpu/cpu31/topology/thread_siblings | 1 - .../cpu/cpu31/topology/thread_siblings_list | 1 + .../cpu/cpu32/topology/thread_siblings | 1 - .../cpu/cpu32/topology/thread_siblings_list | 1 + .../cpu/cpu33/topology/thread_siblings | 1 - .../cpu/cpu33/topology/thread_siblings_list | 1 + .../cpu/cpu34/topology/thread_siblings | 1 - .../cpu/cpu34/topology/thread_siblings_list | 1 + .../cpu/cpu35/topology/thread_siblings | 1 - .../cpu/cpu35/topology/thread_siblings_list | 1 + .../cpu/cpu36/topology/thread_siblings | 1 - .../cpu/cpu36/topology/thread_siblings_list | 1 + .../cpu/cpu37/topology/thread_siblings | 1 - .../cpu/cpu37/topology/thread_siblings_list | 1 + .../cpu/cpu38/topology/thread_siblings | 1 - .../cpu/cpu38/topology/thread_siblings_list | 1 + .../cpu/cpu39/topology/thread_siblings | 1 - .../cpu/cpu39/topology/thread_siblings_list | 1 + .../cpu/cpu4/topology/thread_siblings | 1 - .../cpu/cpu4/topology/thread_siblings_list | 1 + .../cpu/cpu40/topology/thread_siblings | 1 - .../cpu/cpu40/topology/thread_siblings_list | 1 + .../cpu/cpu41/topology/thread_siblings | 1 - .../cpu/cpu41/topology/thread_siblings_list | 1 + .../cpu/cpu42/topology/thread_siblings | 1 - .../cpu/cpu42/topology/thread_siblings_list | 1 + .../cpu/cpu43/topology/thread_siblings | 1 - .../cpu/cpu43/topology/thread_siblings_list | 1 + .../cpu/cpu44/topology/thread_siblings | 1 - .../cpu/cpu44/topology/thread_siblings_list | 1 + .../cpu/cpu45/topology/thread_siblings | 1 - .../cpu/cpu45/topology/thread_siblings_list | 1 + .../cpu/cpu46/topology/thread_siblings | 1 - .../cpu/cpu46/topology/thread_siblings_list | 1 + .../cpu/cpu47/topology/thread_siblings | 1 - .../cpu/cpu47/topology/thread_siblings_list | 1 + .../cpu/cpu48/topology/thread_siblings | 1 - .../cpu/cpu48/topology/thread_siblings_list | 1 + .../cpu/cpu49/topology/thread_siblings | 1 - .../cpu/cpu49/topology/thread_siblings_list | 1 + .../cpu/cpu5/topology/thread_siblings | 1 - .../cpu/cpu5/topology/thread_siblings_list | 1 + .../cpu/cpu50/topology/thread_siblings | 1 - .../cpu/cpu50/topology/thread_siblings_list | 1 + .../cpu/cpu51/topology/thread_siblings | 1 - .../cpu/cpu51/topology/thread_siblings_list | 1 + .../cpu/cpu52/topology/thread_siblings | 1 - .../cpu/cpu52/topology/thread_siblings_list | 1 + .../cpu/cpu53/topology/thread_siblings | 1 - .../cpu/cpu53/topology/thread_siblings_list | 1 + .../cpu/cpu54/topology/thread_siblings | 1 - .../cpu/cpu54/topology/thread_siblings_list | 1 + .../cpu/cpu55/topology/thread_siblings | 1 - .../cpu/cpu55/topology/thread_siblings_list | 1 + .../cpu/cpu56/topology/thread_siblings | 1 - .../cpu/cpu56/topology/thread_siblings_list | 1 + .../cpu/cpu57/topology/thread_siblings | 1 - .../cpu/cpu57/topology/thread_siblings_list | 1 + .../cpu/cpu58/topology/thread_siblings | 1 - .../cpu/cpu58/topology/thread_siblings_list | 1 + .../cpu/cpu59/topology/thread_siblings | 1 - .../cpu/cpu59/topology/thread_siblings_list | 1 + .../cpu/cpu6/topology/thread_siblings | 1 - .../cpu/cpu6/topology/thread_siblings_list | 1 + .../cpu/cpu60/topology/thread_siblings | 1 - .../cpu/cpu60/topology/thread_siblings_list | 1 + .../cpu/cpu61/topology/thread_siblings | 1 - .../cpu/cpu61/topology/thread_siblings_list | 1 + .../cpu/cpu62/topology/thread_siblings | 1 - .../cpu/cpu62/topology/thread_siblings_list | 1 + .../cpu/cpu63/topology/thread_siblings | 1 - .../cpu/cpu63/topology/thread_siblings_list | 1 + .../cpu/cpu7/topology/thread_siblings | 1 - .../cpu/cpu7/topology/thread_siblings_list | 1 + .../cpu/cpu8/topology/thread_siblings | 1 - .../cpu/cpu8/topology/thread_siblings_list | 1 + .../cpu/cpu9/topology/thread_siblings | 1 - .../cpu/cpu9/topology/thread_siblings_list | 1 + .../cpu/cpu0/topology/core_siblings | 1 - .../cpu/cpu0/topology/thread_siblings | 1 - .../cpu/cpu1/topology/core_siblings | 1 - .../cpu/cpu1/topology/thread_siblings | 1 - .../cpu/cpu2/topology/core_siblings | 1 - .../cpu/cpu2/topology/thread_siblings | 1 - .../cpu/cpu3/topology/core_siblings | 1 - .../cpu/cpu3/topology/thread_siblings | 1 - .../cpu/cpu4/topology/core_siblings | 1 - .../cpu/cpu4/topology/thread_siblings | 1 - .../cpu/cpu5/topology/core_siblings | 1 - .../cpu/cpu5/topology/thread_siblings | 1 - .../cpu/cpu6/topology/core_siblings | 1 - .../cpu/cpu6/topology/thread_siblings | 1 - .../cpu/cpu7/topology/core_siblings | 1 - .../cpu/cpu7/topology/thread_siblings | 1 - tests/virhostcputest.c | 1 + 624 files changed, 317 insertions(+), 499 deletions(-) delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-aarch64-high-ids.cpuinfo create mode 100644 tests/virhostcpudata/linux-aarch64-high-ids.expected delete mode 100644 tests/virhostcpudata/linux-caches1/cpu/offline delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu104/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu104/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu112/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu112/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu120/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu120/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu128/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu128/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu136/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu136/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu16/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu16/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu24/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu24/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu40/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu40/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu48/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu48/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu72/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu72/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu0/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu1/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu1/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu2/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu2/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu3/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu3/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu4/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu4/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu5/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu5/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu6/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu6/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu7/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu7/topology/thread_siblings copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu0/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/thread_siblings_list rename tests/virhostcpudata/{linux-raspberrypi/cpu/cpu0/topology/core_siblings => linux-high-ids/cpu/cpu1/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/thread_siblings_list rename tests/virhostcpudata/{linux-raspberrypi/cpu/cpu0/topology/thread_siblings => linux-high-ids/cpu/cpu10/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/thread_siblings_list copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu11/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/thread_siblings_list copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu12/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/thread_siblings_list copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu13/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/thread_siblings_list copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu14/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/thread_siblings_list copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu15/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/thread_siblings_list copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu2/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/thread_siblings_list copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu3/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/thread_siblings_list copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu4/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/thread_siblings_list copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu5/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/thread_siblings_list copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu6/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/thread_siblings_list copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu7/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/thread_siblings_list copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu8/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/thread_siblings_list copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu9/online} (100%) create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/online create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/present create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu0 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu1 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu2 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu3 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu4 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu5 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu6 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu7 rename tests/virhostcpudata/{linux-caches1/cpu/possible => linux-high-ids/node/node0/cpulist} (100%) create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu10 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu11 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu12 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu13 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu14 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu15 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu8 create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu9 create mode 100644 tests/virhostcpudata/linux-high-ids/node/node1/cpulist delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu0/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu1/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu1/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu2/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu2/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu3/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu3/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu4/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu4/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu5/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu5/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu6/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu6/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu7/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu7/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu0/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu104/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu104/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu112/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu112/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu120/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu120/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu128/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu128/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu136/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu136/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu144/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu144/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu152/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu152/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu16/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu16/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu24/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu24/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu32/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu32/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu40/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu40/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu48/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu48/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu56/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu56/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu64/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu64/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu72/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu72/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu8/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu8/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu80/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu80/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu88/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu88/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu96/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu96/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu0/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu104/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu104/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu112/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu112/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu128/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu128/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu136/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu136/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu16/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu16/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu24/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu24/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu32/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu32/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu40/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu40/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu48/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu48/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu56/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu56/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu72/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu72/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu8/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu8/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu80/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu80/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu88/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu88/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu96/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu96/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu104/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu104/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu112/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu112/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu128/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu128/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu136/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu136/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu152/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu152/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu153/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu153/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu154/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu154/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu155/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu155/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu156/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu156/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu157/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu157/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu158/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu158/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu159/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu159/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu40/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu40/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu48/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu48/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu56/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu56/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu68/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu68/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu72/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu72/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu8/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu8/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu80/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu80/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu88/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu88/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu96/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu96/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test1/cpu/cpu0/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-test1/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test1/cpu/cpu1/core_siblings delete mode 100644 tests/virhostcpudata/linux-test1/cpu/cpu1/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test1/cpu/cpu1/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-test1/cpu/cpu1/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test2/cpu/cpu0/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-test2/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test2/cpu/cpu1/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-test2/cpu/cpu1/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu1/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu10/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu11/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu12/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu13/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu14/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu15/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu16/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu17/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu18/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu19/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu2/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu20/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu21/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu22/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu23/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu24/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu25/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu26/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu27/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu28/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu29/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu3/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu30/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu31/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu32/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu33/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu34/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu35/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu36/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu37/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu38/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu39/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu4/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu40/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu41/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu42/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu43/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu44/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu45/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu46/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu47/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu5/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu6/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu7/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu8/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu9/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu1/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu10/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu11/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu12/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu13/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu14/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu15/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu2/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu3/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu4/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu5/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu6/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu7/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu8/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu9/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu0/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu1/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu1/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu2/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu2/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu3/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu3/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu0/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu0/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu1/topology/thread_siblings rename tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-test6/cpu/cpu1/topology/thread_siblings_list} (100%) delete mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu2/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu2/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu3/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu3/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu4/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu4/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu6/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu6/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu1/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu10/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu11/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu12/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu13/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu14/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu15/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu16/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu17/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu18/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu19/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu2/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu20/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu21/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu22/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu23/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu3/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu4/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu5/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu6/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu7/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu8/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu9/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu0/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu0/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu1/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu1/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu10/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu10/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu11/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu11/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu12/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu12/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu13/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu13/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu14/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu14/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu15/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu15/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu16/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu16/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu17/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu17/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu18/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu18/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu19/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu19/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu2/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu2/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu20/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu20/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu21/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu21/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu22/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu22/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu23/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu23/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu24/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu24/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu25/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu25/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu26/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu26/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu27/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu27/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu28/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu28/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu29/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu29/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu3/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu3/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu30/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu30/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu31/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu31/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu32/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu32/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu33/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu33/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu34/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu34/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu35/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu35/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu36/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu36/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu37/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu37/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu38/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu38/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu39/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu39/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu4/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu4/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu40/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu40/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu41/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu41/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu42/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu42/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu43/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu43/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu44/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu44/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu45/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu45/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu46/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu46/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu47/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu47/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu48/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu48/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu49/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu49/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu5/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu5/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu50/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu50/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu51/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu51/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu52/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu52/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu53/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu53/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu54/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu54/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu55/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu55/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu56/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu56/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu57/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu57/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu58/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu58/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu59/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu59/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu6/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu6/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu60/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu60/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu61/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu61/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu62/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu62/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu63/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu63/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu7/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu7/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu8/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu8/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu9/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu9/topology/thread_siblings_list delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings -- 2.17.1

3 9

[libvirt] [jenkins-ci PATCH] guests: Remove Fedora 26 specific mapping
by Andrea Bolognani 14 Aug '18

14 Aug '18

We dropped Fedora 26 support in commit 9dbfddc3e7d9, but somehow overlooked this bit at the time. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. guests/vars/mappings.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 454afe5..b2d63c9 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -712,7 +712,6 @@ mappings: deb: libc-dev-bin rpm: rpcgen CentOS7: glibc-common - Fedora26: glibc-common Fedora27: glibc-common FreeBSD: -- 2.17.1

1 0