- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Default hwclock source for sPAPR to RTC
by Kothapally Madhu Pavan 13 Jul '17

13 Jul '17

QEMU fails to launch a sPAPR guest with clock sources other that RTC. Internally qemu only uses RTC timer for hwclock. This patch reports the right error message instead of qemu erroring out when any other timer other than RTC is used. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c53ab97..31561ce 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6440,6 +6440,15 @@ qemuBuildClockCommandLine(virCommandPtr cmd, break; case VIR_DOMAIN_TIMER_NAME_PIT: + /* Only RTC timer is supported as hwclock for sPAPR machines */ + if (ARCH_IS_PPC64(def->os.arch)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported clock timer '%s' for '%s' architecture"), + virDomainTimerNameTypeToString(def->clock.timers[i]->name), + virArchToString(def->os.arch)); + return -1; + } + switch (def->clock.timers[i]->tickpolicy) { case -1: case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: @@ -6483,13 +6492,21 @@ qemuBuildClockCommandLine(virCommandPtr cmd, break; case VIR_DOMAIN_TIMER_NAME_HPET: + /* Only RTC timer is supported as hwclock for sPAPR machines */ + if (ARCH_IS_PPC64(def->os.arch)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported clock timer '%s' for '%s' architecture"), + virDomainTimerNameTypeToString(def->clock.timers[i]->name), + virArchToString(def->os.arch)); + return -1; + } + /* the only meaningful attribute for hpet is "present". If * present is -1, that means it wasn't specified, and * should be left at the default for the * hypervisor. "default" when -no-hpet exists is "yes", * and when -no-hpet doesn't exist is "no". "confusing"? * "yes"! */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_HPET)) { if (def->clock.timers[i]->present == 0) virCommandAddArg(cmd, "-no-hpet"); @@ -7047,6 +7064,15 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, for (i = 0; i < def->clock.ntimers; i++) { virDomainTimerDefPtr timer = def->clock.timers[i]; + /* Only RTC timer is supported as hwclock for sPAPR machines */ + if (ARCH_IS_PPC64(def->os.arch) && timer->name != VIR_DOMAIN_TIMER_NAME_RTC) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported clock timer '%s' for '%s' architecture"), + virDomainTimerNameTypeToString(def->clock.timers[i]->name), + virArchToString(def->os.arch)); + return -1; + } + if (timer->name == VIR_DOMAIN_TIMER_NAME_KVMCLOCK && timer->present != -1) { virBufferAsprintf(&buf, "%s,%ckvmclock", -- 1.8.3.1

3 3

[libvirt] [PATCH] Rewrite the way mockable functions are handled.
by Daniel P. Berrange 13 Jul '17

13 Jul '17

Currently any mockable functions are marked with attributes noinline, noclone and weak. This prevents the compiler from optimizing away the impl of these functions. It has an unfortunate side effect with the libtool convenience libraries, if executables directly link to them. For example virlockd, virlogd both link to libvirt_util.la When this is done, the linker does not consider weak symbols as being undefined, so it never copies them into the final executable. In this new approach, we stop annotating the headers entirely. Instead we create a weak function alias in the source. int fooImpl(void) { ..the real code.. } int foo(void) __attribute__((noinline, noclone, weak, alias("fooImpl")) If any functions in the same file call "foo", this prevents the optimizer from inlining any part of fooImpl. When linking to the libtool convenience static library, we also get all the symbols present. Finally the test suite can just directly define a 'foo' function in its source, removing the need to use LD_PRELOAD (though removal of LD_PRELOADS is left for a future patch). Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- build-aux/mock-noinline.pl | 35 ++++++------- src/internal.h | 59 +++++++++++---------- src/qemu/qemu_capabilities.c | 9 ++-- src/qemu/qemu_capspriv.h | 2 +- src/rpc/virnetsocket.c | 48 ++++++++++------- src/rpc/virnetsocket.h | 6 +-- src/util/vircommand.c | 6 ++- src/util/vircommand.h | 2 +- src/util/vircrypto.c | 5 +- src/util/vircrypto.h | 2 +- src/util/virfile.c | 5 +- src/util/virfile.h | 2 +- src/util/virhostcpu.c | 10 ++-- src/util/virhostcpu.h | 4 +- src/util/virmacaddr.c | 6 ++- src/util/virmacaddr.h | 2 +- src/util/virnetdev.c | 23 +++++---- src/util/virnetdev.h | 9 ++-- src/util/virnetdevip.c | 9 ++-- src/util/virnetdevip.h | 2 +- src/util/virnetdevopenvswitch.c | 8 +-- src/util/virnetdevopenvswitch.h | 2 +- src/util/virnetdevtap.c | 45 ++++++++-------- src/util/virnetdevtap.h | 6 +-- src/util/virnuma.c | 111 +++++++++++++++++++++++----------------- src/util/virnuma.h | 16 +++--- src/util/virrandom.c | 18 ++++--- src/util/virrandom.h | 6 +-- src/util/virscsi.c | 13 ++--- src/util/virscsi.h | 2 +- src/util/virscsivhost.c | 5 +- src/util/virscsivhost.h | 2 +- src/util/virtpm.c | 5 +- src/util/virtpm.h | 2 +- src/util/virutil.c | 33 +++++++----- src/util/virutil.h | 10 ++-- src/util/viruuid.c | 5 +- src/util/viruuid.h | 2 +- 38 files changed, 296 insertions(+), 241 deletions(-) diff --git a/build-aux/mock-noinline.pl b/build-aux/mock-noinline.pl index 2745d4b..1d39300 100644 --- a/build-aux/mock-noinline.pl +++ b/build-aux/mock-noinline.pl @@ -1,28 +1,28 @@ #!/usr/bin/perl -my %noninlined; +my %mockable; my %mocked; # Functions in public header don't get the noinline annotation # so whitelist them here -$noninlined{"virEventAddTimeout"} = 1; +$mockable{"virEventAddTimeout"} = 1; foreach my $arg (@ARGV) { - if ($arg =~ /\.h$/) { - #print "Scan header $arg\n"; - &scan_annotations($arg); - } elsif ($arg =~ /mock\.c$/) { + if ($arg =~ /mock\.c$/) { #print "Scan mock $arg\n"; &scan_overrides($arg); + } elsif ($arg =~ /\.c$/) { + #print "Scan source $arg\n"; + &scan_annotations($arg); } } my $warned = 0; foreach my $func (keys %mocked) { - next if exists $noninlined{$func}; + next if exists $mockable{$func}; $warned++; - print STDERR "$func is mocked at $mocked{$func} but missing noinline annotation\n"; + print STDERR "$func is mocked at $mocked{$func} but missing VIR_MOCKABLE impl\n"; } exit $warned ? 1 : 0; @@ -34,19 +34,16 @@ sub scan_annotations { open FH, $file or die "cannot read $file: $!"; my $func; + my $mockable = 0; while (<FH>) { - if (/^\s*(\w+)\(/ || /^(?:\w+\*?\s+)+(?:\*\s*)?(\w+)\(/) { - my $name = $1; - if ($name !~ /ATTRIBUTE/) { - $func = $name; - } - } elsif (/^\s*$/) { - $func = undef; - } - if (/ATTRIBUTE_MOCKABLE/) { - if (defined $func) { - $noninlined{$func} = 1; + if (/^VIR_MOCKABLE/) { + $mockable = 1; + } elsif ($mockable) { + if (/^\s*(\w+),$/) { + my $func = $1; + $mockable{$func} = 1; } + $mockable = 0; } } diff --git a/src/internal.h b/src/internal.h index edc3587..e34338e 100644 --- a/src/internal.h +++ b/src/internal.h @@ -113,33 +113,6 @@ # endif /** - * ATTRIBUTE_MOCKABLE: - * - * Ensure that the symbol can be overridden in a mock - * library preload. This implies a number of attributes - * - * - noinline: prevents the body being inlined to - * callers, - * - noclone: prevents specialized copies of the - * function body being created for different - * callers - * - weak: prevents the compiler making optimizations - * such as constant return value propagation - * - */ -# ifndef ATTRIBUTE_MOCKABLE -# if defined(WIN32) -# define ATTRIBUTE_MOCKABLE -# else -# if __GNUC_PREREQ(4, 5) -# define ATTRIBUTE_MOCKABLE __attribute__((__noinline__, __noclone__, __weak__)) -# else -# define ATTRIBUTE_MOCKABLE __attribute__((__noinline__, __weak__)) -# endif -# endif -# endif - -/** * ATTRIBUTE_FMT_PRINTF * * Macro used to check printf like functions, if compiling @@ -251,6 +224,38 @@ /* + * VIR_MOCKABLE(return type, func name, args...) + * + * Defines a function implementation that can be later overriden in + * the test suite + * + * NB, Win32 can't use 'weak' attribute because such symbols + * can't be marked exported in DLLs + * + * NB, the ${name}Impl function ought to be static, but that + * causes CLang to throw bogus errors about unused functions, + * despite there being an alias to it + */ +# ifdef WIN32 +# define VIR_MOCKABLE(ret, name, ...) \ + ret name(__VA_ARGS__) __attribute__((noinline, noclone, __alias__(#name "Impl"))); \ + ret name ## Impl (__VA_ARGS__); \ + ret name ## Impl (__VA_ARGS__) +# else +# if __GNUC_PREREQ(4, 5) +# define VIR_MOCKABLE(ret, name, ...) \ + ret name(__VA_ARGS__) __attribute__((noinline, noclone, weak, __alias__(#name "Impl"))); \ + ret name ## Impl (__VA_ARGS__); \ + ret name ## Impl (__VA_ARGS__) +# else +# define VIR_MOCKABLE(ret, name, ...) \ + ret name(__VA_ARGS__) __attribute__((noinline, weak, __alias__(#name "Impl"))); \ + ret name ## Impl (__VA_ARGS__); \ + ret name ## Impl (__VA_ARGS__) +# endif +# endif + +/* * Use this when passing possibly-NULL strings to printf-a-likes. */ # define NULLSTR(s) ((s) ? (s) : "<null>") diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index db9f9b8..d4316bc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1148,10 +1148,11 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, } -virCPUDefPtr -virQEMUCapsProbeHostCPUForEmulator(virCapsPtr caps, - virQEMUCapsPtr qemuCaps, - virDomainVirtType type) +VIR_MOCKABLE(virCPUDefPtr, + virQEMUCapsProbeHostCPUForEmulator, + virCapsPtr caps, + virQEMUCapsPtr qemuCaps, + virDomainVirtType type) { size_t nmodels; char **models; diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 6cc189e..a7c92fd 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -95,7 +95,7 @@ virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps, virCPUDefPtr virQEMUCapsProbeHostCPUForEmulator(virCapsPtr caps, virQEMUCapsPtr qemuCaps, - virDomainVirtType type) ATTRIBUTE_MOCKABLE; + virDomainVirtType type); void virQEMUCapsSetGICCapabilities(virQEMUCapsPtr qemuCaps, diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index d228c8a..db872bb 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1425,11 +1425,13 @@ int virNetSocketGetPort(virNetSocketPtr sock) #if defined(SO_PEERCRED) -int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, - uid_t *uid, - gid_t *gid, - pid_t *pid, - unsigned long long *timestamp) +VIR_MOCKABLE(int, + virNetSocketGetUNIXIdentity, + virNetSocketPtr sock, + uid_t *uid, + gid_t *gid, + pid_t *pid, + unsigned long long *timestamp) { # if defined(HAVE_STRUCT_SOCKPEERCRED) struct sockpeercred cr; @@ -1482,11 +1484,13 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, # define VIR_SOL_PEERCRED 0 # endif -int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, - uid_t *uid, - gid_t *gid, - pid_t *pid, - unsigned long long *timestamp) +VIR_MOCKABLE(int, + virNetSocketGetUNIXIdentity, + virNetSocketPtr sock, + uid_t *uid, + gid_t *gid, + pid_t *pid, + unsigned long long *timestamp) { struct xucred cr; socklen_t cr_len = sizeof(cr); @@ -1550,11 +1554,13 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, return ret; } #else -int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, - uid_t *uid ATTRIBUTE_UNUSED, - gid_t *gid ATTRIBUTE_UNUSED, - pid_t *pid ATTRIBUTE_UNUSED, - unsigned long long *timestamp ATTRIBUTE_UNUSED) +VIR_MOCKABLE(int, + virNetSocketGetUNIXIdentity, + virNetSocketPtr sock ATTRIBUTE_UNUSED, + uid_t *uid ATTRIBUTE_UNUSED, + gid_t *gid ATTRIBUTE_UNUSED, + pid_t *pid ATTRIBUTE_UNUSED, + unsigned long long *timestamp ATTRIBUTE_UNUSED) { /* XXX Many more OS support UNIX socket credentials we could port to. See dbus ....*/ virReportSystemError(ENOSYS, "%s", @@ -1564,8 +1570,10 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, #endif #ifdef WITH_SELINUX -int virNetSocketGetSELinuxContext(virNetSocketPtr sock, - char **context) +VIR_MOCKABLE(int, + virNetSocketGetSELinuxContext, + virNetSocketPtr sock, + char **context) { security_context_t seccon = NULL; int ret = -1; @@ -1593,8 +1601,10 @@ int virNetSocketGetSELinuxContext(virNetSocketPtr sock, return ret; } #else -int virNetSocketGetSELinuxContext(virNetSocketPtr sock ATTRIBUTE_UNUSED, - char **context) +VIR_MOCKABLE(int, + virNetSocketGetSELinuxContext, + virNetSocketPtr sock ATTRIBUTE_UNUSED, + char **context) { *context = NULL; return 0; diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h index 3c2945e..1e75ee6 100644 --- a/src/rpc/virnetsocket.h +++ b/src/rpc/virnetsocket.h @@ -136,11 +136,9 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, uid_t *uid, gid_t *gid, pid_t *pid, - unsigned long long *timestamp) - ATTRIBUTE_MOCKABLE; + unsigned long long *timestamp); int virNetSocketGetSELinuxContext(virNetSocketPtr sock, - char **context) - ATTRIBUTE_MOCKABLE; + char **context); int virNetSocketSetBlocking(virNetSocketPtr sock, bool blocking); diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 60c1121..4ac0aa9 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -985,8 +985,9 @@ virCommandNewVAList(const char *binary, va_list list) * be closed in the parent no later than Run/RunAsync/Free. The parent * should cease using the @fd when this call completes */ -void -virCommandPassFD(virCommandPtr cmd, int fd, unsigned int flags) +VIR_MOCKABLE(void, + virCommandPassFD, + virCommandPtr cmd, int fd, unsigned int flags) { int ret = 0; @@ -1012,6 +1013,7 @@ virCommandPassFD(virCommandPtr cmd, int fd, unsigned int flags) } } + /** * virCommandPassListenFDs: * @cmd: the command to modify diff --git a/src/util/vircommand.h b/src/util/vircommand.h index c042a53..99dcdeb 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -58,7 +58,7 @@ enum { void virCommandPassFD(virCommandPtr cmd, int fd, - unsigned int flags) ATTRIBUTE_MOCKABLE; + unsigned int flags); void virCommandPassListenFDs(virCommandPtr cmd); diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 48b04fc..13cacfb 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -300,8 +300,9 @@ virCryptoEncryptData(virCryptoCipher algorithm, * * Returns pointer memory containing byte stream on success, NULL on failure */ -uint8_t * -virCryptoGenerateRandom(size_t nbytes) +VIR_MOCKABLE(uint8_t *, + virCryptoGenerateRandom, + size_t nbytes) { uint8_t *buf; int ret; diff --git a/src/util/vircrypto.h b/src/util/vircrypto.h index 50400c6..52ba3b3 100644 --- a/src/util/vircrypto.h +++ b/src/util/vircrypto.h @@ -55,6 +55,6 @@ int virCryptoEncryptData(virCryptoCipher algorithm, ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(6) ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(9) ATTRIBUTE_RETURN_CHECK; -uint8_t *virCryptoGenerateRandom(size_t nbytes) ATTRIBUTE_MOCKABLE; +uint8_t *virCryptoGenerateRandom(size_t nbytes); #endif /* __VIR_CRYPTO_H__ */ diff --git a/src/util/virfile.c b/src/util/virfile.c index d444b32..b612ad5 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1824,8 +1824,9 @@ virFileIsDir(const char *path) * Returns true if the file exists, false if it doesn't, setting errno * appropriately. */ -bool -virFileExists(const char *path) +VIR_MOCKABLE(bool, + virFileExists, + const char *path) { return access(path, F_OK) == 0; } diff --git a/src/util/virfile.h b/src/util/virfile.h index 32c9115..40034f0 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -188,7 +188,7 @@ void virFileActivateDirOverride(const char *argv0) off_t virFileLength(const char *path, int fd) ATTRIBUTE_NONNULL(1); bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1); -bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1) ATTRIBUTE_MOCKABLE; +bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1); bool virFileIsExecutable(const char *file) ATTRIBUTE_NONNULL(1); enum { diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index c485a97..4d63842 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1112,8 +1112,9 @@ virHostCPUGetMap(unsigned char **cpumap, * * Returns the number of threads per subcore if subcores are in use, zero * if subcores are not in use, and a negative value on error */ -int -virHostCPUGetThreadsPerSubcore(virArch arch) +VIR_MOCKABLE(int, + virHostCPUGetThreadsPerSubcore, + virArch arch) { int threads_per_subcore = 0; int kvmfd; @@ -1167,8 +1168,9 @@ virHostCPUGetThreadsPerSubcore(virArch arch ATTRIBUTE_UNUSED) #endif /* HAVE_LINUX_KVM_H && defined(KVM_CAP_PPC_SMT) */ #if HAVE_LINUX_KVM_H -int -virHostCPUGetKVMMaxVCPUs(void) +VIR_MOCKABLE(int, + virHostCPUGetKVMMaxVCPUs, + void) { int fd; int ret; diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 3b30a0d..e9c22ee 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -38,7 +38,7 @@ bool virHostCPUHasBitmap(void); virBitmapPtr virHostCPUGetPresentBitmap(void); virBitmapPtr virHostCPUGetOnlineBitmap(void); int virHostCPUGetCount(void); -int virHostCPUGetThreadsPerSubcore(virArch arch) ATTRIBUTE_MOCKABLE; +int virHostCPUGetThreadsPerSubcore(virArch arch); int virHostCPUGetMap(unsigned char **cpumap, unsigned int *online, @@ -51,7 +51,7 @@ int virHostCPUGetInfo(virArch hostarch, unsigned int *cores, unsigned int *threads); -int virHostCPUGetKVMMaxVCPUs(void) ATTRIBUTE_MOCKABLE; +int virHostCPUGetKVMMaxVCPUs(void); int virHostCPUStatsAssign(virNodeCPUStatsPtr param, const char *name, diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 7afe032..29d6980 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -223,8 +223,10 @@ virMacAddrParseHex(const char *str, virMacAddrPtr addr) return 0; } -void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], - virMacAddrPtr addr) +VIR_MOCKABLE(void, + virMacAddrGenerate, + const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], + virMacAddrPtr addr) { addr->addr[0] = prefix[0]; addr->addr[1] = prefix[1]; diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h index 79492cd..ae26867 100644 --- a/src/util/virmacaddr.h +++ b/src/util/virmacaddr.h @@ -48,7 +48,7 @@ void virMacAddrGetRaw(const virMacAddr *src, unsigned char dst[VIR_MAC_BUFLEN]); const char *virMacAddrFormat(const virMacAddr *addr, char *str); void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], - virMacAddrPtr addr) ATTRIBUTE_MOCKABLE; + virMacAddrPtr addr); int virMacAddrParse(const char* str, virMacAddrPtr addr) ATTRIBUTE_RETURN_CHECK; int virMacAddrParseHex(const char* str, diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 90b7bee..7c1ec5c 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -346,9 +346,9 @@ virNetDevSetMACInternal(const char *ifname, #endif -int -virNetDevSetMAC(const char *ifname, - const virMacAddr *macaddr) +VIR_MOCKABLE(int, + virNetDevSetMAC, + const char *ifname, const virMacAddr *macaddr) { return virNetDevSetMACInternal(ifname, macaddr, false); } @@ -686,9 +686,9 @@ virNetDevSetIFFlag(const char *ifname, * * Returns 0 in case of success or -1 on error. */ -int -virNetDevSetOnline(const char *ifname, - bool online) +VIR_MOCKABLE(int, + virNetDevSetOnline, + const char *ifname, bool online) { return virNetDevSetIFFlag(ifname, VIR_IFF_UP, online); @@ -1122,9 +1122,9 @@ int virNetDevValidateConfig(const char *ifname ATTRIBUTE_UNUSED, #ifdef __linux__ -int -virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, - const char *file) +VIR_MOCKABLE(int, + virNetDevSysfsFile, + char **pf_sysfs_device_link, const char *ifname, const char *file) { if (virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/%s", ifname, file) < 0) @@ -3268,8 +3268,9 @@ int virNetDevSetCoalesce(const char *ifname, * This function executes script for new tap device created by libvirt. * Returns 0 in case of success or -1 on failure */ -int -virNetDevRunEthernetScript(const char *ifname, const char *script) +VIR_MOCKABLE(int, + virNetDevRunEthernetScript, + const char *ifname, const char *script) { virCommandPtr cmd; int ret; diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 2e9a9c4..c2c09af 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -156,7 +156,7 @@ int virNetDevExists(const char *brname) int virNetDevSetOnline(const char *ifname, bool online) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevGetOnline(const char *ifname, bool *online) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; @@ -164,7 +164,7 @@ int virNetDevGetOnline(const char *ifname, int virNetDevSetMAC(const char *ifname, const virMacAddr *macaddr) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevGetMAC(const char *ifname, virMacAddrPtr macaddr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; @@ -303,8 +303,7 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_RETURN_CHECK; -int virNetDevRunEthernetScript(const char *ifname, const char *script) - ATTRIBUTE_MOCKABLE; +int virNetDevRunEthernetScript(const char *ifname, const char *script); #endif /* __VIR_NETDEV_H__ */ diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index bf98ed8..6dcd2e8 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -163,11 +163,10 @@ virNetDevCreateNetlinkAddressMessage(int messageType, * * Returns 0 in case of success or -1 in case of error. */ -int -virNetDevIPAddrAdd(const char *ifname, - virSocketAddr *addr, - virSocketAddr *peer, - unsigned int prefix) +VIR_MOCKABLE(int, + virNetDevIPAddrAdd, + const char *ifname, virSocketAddr *addr, + virSocketAddr *peer, unsigned int prefix) { virSocketAddr *broadcast = NULL; int ret = -1; diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h index 972a49a..cc466ca 100644 --- a/src/util/virnetdevip.h +++ b/src/util/virnetdevip.h @@ -67,7 +67,7 @@ int virNetDevIPAddrAdd(const char *ifname, virSocketAddr *addr, virSocketAddr *peer, unsigned int prefix) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevIPRouteAdd(const char *ifname, virSocketAddrPtr addr, unsigned int prefix, diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index a5ecfb6..ab292a4 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -382,7 +382,7 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, } /** - * virNetDevOpenvswitchVhostuserGetIfname: + * virNetDevOpenvswitchGetVhostuserIfname: * @path: the path of the unix socket * @ifname: the retrieved name of the interface * @@ -392,9 +392,9 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, * 0 if it is not, but no other error occurred, * -1 otherwise. */ -int -virNetDevOpenvswitchGetVhostuserIfname(const char *path, - char **ifname) +VIR_MOCKABLE(int, + virNetDevOpenvswitchGetVhostuserIfname, + const char *path, char **ifname) { virCommandPtr cmd = NULL; char *tmpIfname = NULL; diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h index dc677ca..7380a2d 100644 --- a/src/util/virnetdevopenvswitch.h +++ b/src/util/virnetdevopenvswitch.h @@ -59,6 +59,6 @@ int virNetDevOpenvswitchInterfaceStats(const char *ifname, int virNetDevOpenvswitchGetVhostuserIfname(const char *path, char **ifname) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; #endif /* __VIR_NETDEV_OPENVSWITCH_H__ */ diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 175dc2b..93cb65d 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -98,8 +98,9 @@ virNetDevTapGetName(int tapfd ATTRIBUTE_UNUSED, char **ifname ATTRIBUTE_UNUSED) * Returns the proper interface name or NULL if no corresponding interface * found. */ -char* -virNetDevTapGetRealDeviceName(char *ifname ATTRIBUTE_UNUSED) +VIR_MOCKABLE(char *, + virNetDevTapGetRealDeviceName, + char *ifname ATTRIBUTE_UNUSED) { #ifdef TAPGIFNAME char *ret = NULL; @@ -238,11 +239,13 @@ virNetDevProbeVnetHdr(int tapfd) * * Returns 0 in case of success or -1 on failure. */ -int virNetDevTapCreate(char **ifname, - const char *tunpath, - int *tapfd, - size_t tapfdSize, - unsigned int flags) +VIR_MOCKABLE(int, + virNetDevTapCreate, + char **ifname, + const char *tunpath, + int *tapfd, + size_t tapfdSize, + unsigned int flags) { size_t i; struct ifreq ifr; @@ -608,19 +611,21 @@ virNetDevTapAttachBridge(const char *tapname, * * Returns 0 in case of success or -1 on failure */ -int virNetDevTapCreateInBridgePort(const char *brname, - char **ifname, - const virMacAddr *macaddr, - const unsigned char *vmuuid, - const char *tunpath, - int *tapfd, - size_t tapfdSize, - virNetDevVPortProfilePtr virtPortProfile, - virNetDevVlanPtr virtVlan, - virNetDevCoalescePtr coalesce, - unsigned int mtu, - unsigned int *actualMTU, - unsigned int flags) +VIR_MOCKABLE(int, + virNetDevTapCreateInBridgePort, + const char *brname, + char **ifname, + const virMacAddr *macaddr, + const unsigned char *vmuuid, + const char *tunpath, + int *tapfd, + size_t tapfdSize, + virNetDevVPortProfilePtr virtPortProfile, + virNetDevVlanPtr virtVlan, + virNetDevCoalescePtr coalesce, + unsigned int mtu, + unsigned int *actualMTU, + unsigned int flags) { virMacAddr tapmac; char macaddrstr[VIR_MAC_STRING_BUFLEN]; diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index 1c4343e..bd5ec14 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -39,7 +39,7 @@ int virNetDevTapCreate(char **ifname, int *tapfd, size_t tapfdSize, unsigned int flags) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevTapDelete(const char *ifname, const char *tunpath) @@ -49,7 +49,7 @@ int virNetDevTapGetName(int tapfd, char **ifname) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; char* virNetDevTapGetRealDeviceName(char *ifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; typedef enum { VIR_NETDEV_TAP_CREATE_NONE = 0, @@ -89,7 +89,7 @@ int virNetDevTapCreateInBridgePort(const char *brname, unsigned int *actualMTU, unsigned int flags) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_RETURN_CHECK; int virNetDevTapInterfaceStats(const char *ifname, virDomainInterfaceStatsPtr stats) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index bebe301..6300bc1 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -160,8 +160,9 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, return ret; } -bool -virNumaIsAvailable(void) +VIR_MOCKABLE(bool, + virNumaIsAvailable, + void) { return numa_available() != -1; } @@ -174,8 +175,9 @@ virNumaIsAvailable(void) * * Returns the highest NUMA node id on success, -1 on error. */ -int -virNumaGetMaxNode(void) +VIR_MOCKABLE(int, + virNumaGetMaxNode, + void) { int ret; @@ -207,10 +209,11 @@ virNumaGetMaxNode(void) * * Returns 0 on success, -1 on error. Does not report errors. */ -int -virNumaGetNodeMemory(int node, - unsigned long long *memsize, - unsigned long long *memfree) +VIR_MOCKABLE(int, + virNumaGetNodeMemory, + int node, + unsigned long long *memsize, + unsigned long long *memfree) { long long node_size; long long node_free; @@ -248,9 +251,10 @@ virNumaGetNodeMemory(int node, # define n_bits(var) (8 * sizeof(var)) # define MASK_CPU_ISSET(mask, cpu) \ (((mask)[((cpu) / n_bits(*(mask)))] >> ((cpu) % n_bits(*(mask)))) & 1) -int -virNumaGetNodeCPUs(int node, - virBitmapPtr *cpus) +VIR_MOCKABLE(int, + virNumaGetNodeCPUs, + int node, + virBitmapPtr *cpus) { unsigned long *mask = NULL; unsigned long *allonesmask = NULL; @@ -321,15 +325,17 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode ATTRIBUTE_UNUSED, return 0; } -bool -virNumaIsAvailable(void) +VIR_MOCKABLE(bool, + virNumaIsAvailable, + void) { return false; } -int -virNumaGetMaxNode(void) +VIR_MOCKABLE(int, + virNumaGetMaxNode, + void) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("NUMA isn't available on this host")); @@ -337,10 +343,11 @@ virNumaGetMaxNode(void) } -int -virNumaGetNodeMemory(int node ATTRIBUTE_UNUSED, - unsigned long long *memsize, - unsigned long long *memfree) +VIR_MOCKABLE(int, + virNumaGetNodeMemory, + int node ATTRIBUTE_UNUSED, + unsigned long long *memsize, + unsigned long long *memfree) { if (memsize) *memsize = 0; @@ -353,9 +360,10 @@ virNumaGetNodeMemory(int node ATTRIBUTE_UNUSED, } -int -virNumaGetNodeCPUs(int node ATTRIBUTE_UNUSED, - virBitmapPtr *cpus) +VIR_MOCKABLE(int, + virNumaGetNodeCPUs, + int node ATTRIBUTE_UNUSED, + virBitmapPtr *cpus) { *cpus = NULL; @@ -390,8 +398,9 @@ virNumaGetMaxCPUs(void) * Returns: true if @node is available, * false if @node doesn't exist */ -bool -virNumaNodeIsAvailable(int node) +VIR_MOCKABLE(bool, + virNumaNodeIsAvailable, + int node) { return numa_bitmask_isbitset(numa_nodes_ptr, node); } @@ -416,10 +425,11 @@ virNumaNodeIsAvailable(int node) * * Returns 0 on success, -1 otherwise. */ -int -virNumaGetDistances(int node, - int **distances, - int *ndistances) +VIR_MOCKABLE(int, + virNumaGetDistances, + int node, + int **distances, + int *ndistances) { int ret = -1; int max_node; @@ -454,8 +464,9 @@ virNumaGetDistances(int node, #else /* !(WITH_NUMACTL && HAVE_NUMA_BITMASK_ISBITSET) */ -bool -virNumaNodeIsAvailable(int node) +VIR_MOCKABLE(bool, + virNumaNodeIsAvailable, + int node) { int max_node = virNumaGetMaxNode(); @@ -467,10 +478,11 @@ virNumaNodeIsAvailable(int node) } -int -virNumaGetDistances(int node ATTRIBUTE_UNUSED, - int **distances, - int *ndistances) +VIR_MOCKABLE(int, + virNumaGetDistances, + int node ATTRIBUTE_UNUSED, + int **distances, + int *ndistances) { *distances = NULL; *ndistances = 0; @@ -706,12 +718,13 @@ virNumaGetPageInfo(int node, * * Returns 0 on success, -1 otherwise. */ -int -virNumaGetPages(int node, - unsigned int **pages_size, - unsigned int **pages_avail, - unsigned int **pages_free, - size_t *npages) +VIR_MOCKABLE(int, + virNumaGetPages, + int node, + unsigned int **pages_size, + unsigned int **pages_avail, + unsigned int **pages_free, + size_t *npages) { int ret = -1; char *path = NULL; @@ -943,12 +956,13 @@ virNumaGetPageInfo(int node ATTRIBUTE_UNUSED, } -int -virNumaGetPages(int node ATTRIBUTE_UNUSED, - unsigned int **pages_size ATTRIBUTE_UNUSED, - unsigned int **pages_avail ATTRIBUTE_UNUSED, - unsigned int **pages_free ATTRIBUTE_UNUSED, - size_t *npages ATTRIBUTE_UNUSED) +VIR_MOCKABLE(int, + virNumaGetPages, + int node ATTRIBUTE_UNUSED, + unsigned int **pages_size ATTRIBUTE_UNUSED, + unsigned int **pages_avail ATTRIBUTE_UNUSED, + unsigned int **pages_free ATTRIBUTE_UNUSED, + size_t *npages ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("page info is not supported on this platform")); @@ -968,8 +982,9 @@ virNumaSetPagePoolSize(int node ATTRIBUTE_UNUSED, } #endif /* #ifdef __linux__ */ -bool -virNumaNodesetIsAvailable(virBitmapPtr nodeset) +VIR_MOCKABLE(bool, + virNumaNodesetIsAvailable, + virBitmapPtr nodeset) { ssize_t bit = -1; diff --git a/src/util/virnuma.h b/src/util/virnuma.h index 62b89e9..f3eef32 100644 --- a/src/util/virnuma.h +++ b/src/util/virnuma.h @@ -34,20 +34,20 @@ int virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, virBitmapPtr nodeset); virBitmapPtr virNumaGetHostMemoryNodeset(void); -bool virNumaNodesetIsAvailable(virBitmapPtr nodeset) ATTRIBUTE_MOCKABLE; -bool virNumaIsAvailable(void) ATTRIBUTE_MOCKABLE; -int virNumaGetMaxNode(void) ATTRIBUTE_MOCKABLE; -bool virNumaNodeIsAvailable(int node) ATTRIBUTE_MOCKABLE; +bool virNumaNodesetIsAvailable(virBitmapPtr nodeset); +bool virNumaIsAvailable(void); +int virNumaGetMaxNode(void); +bool virNumaNodeIsAvailable(int node); int virNumaGetDistances(int node, int **distances, - int *ndistances) ATTRIBUTE_MOCKABLE; + int *ndistances); int virNumaGetNodeMemory(int node, unsigned long long *memsize, - unsigned long long *memfree) ATTRIBUTE_MOCKABLE; + unsigned long long *memfree); unsigned int virNumaGetMaxCPUs(void); -int virNumaGetNodeCPUs(int node, virBitmapPtr *cpus) ATTRIBUTE_MOCKABLE; +int virNumaGetNodeCPUs(int node, virBitmapPtr *cpus); int virNumaGetPageInfo(int node, unsigned int page_size, @@ -59,7 +59,7 @@ int virNumaGetPages(int node, unsigned int **pages_avail, unsigned int **pages_free, size_t *npages) - ATTRIBUTE_NONNULL(5) ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(5); int virNumaSetPagePoolSize(int node, unsigned int page_size, unsigned long long page_count, diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 41daa40..90d6905 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -99,7 +99,9 @@ VIR_ONCE_GLOBAL_INIT(virRandom) * * Return: a random number with @nbits entropy */ -uint64_t virRandomBits(int nbits) +VIR_MOCKABLE(uint64_t, + virRandomBits, + int nbits) { uint64_t ret = 0; int32_t bits; @@ -170,9 +172,10 @@ uint32_t virRandomInt(uint32_t max) * * Returns 0 on success or an errno on failure */ -int -virRandomBytes(unsigned char *buf, - size_t buflen) +VIR_MOCKABLE(int, + virRandomBytes, + unsigned char *buf, + size_t buflen) { int fd; @@ -205,9 +208,10 @@ virRandomBytes(unsigned char *buf, #define XEN_OUI "00163e" -int -virRandomGenerateWWN(char **wwn, - const char *virt_type) +VIR_MOCKABLE(int, + virRandomGenerateWWN, + char **wwn, + const char *virt_type) { const char *oui = NULL; diff --git a/src/util/virrandom.h b/src/util/virrandom.h index 990a456..f457d2d 100644 --- a/src/util/virrandom.h +++ b/src/util/virrandom.h @@ -24,11 +24,11 @@ # include "internal.h" -uint64_t virRandomBits(int nbits) ATTRIBUTE_MOCKABLE; +uint64_t virRandomBits(int nbits); double virRandom(void); uint32_t virRandomInt(uint32_t max); int virRandomBytes(unsigned char *buf, size_t buflen) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; -int virRandomGenerateWWN(char **wwn, const char *virt_type) ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; +int virRandomGenerateWWN(char **wwn, const char *virt_type); #endif /* __VIR_RANDOM_H__ */ diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 22f2677..d6fe4b7 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -109,12 +109,13 @@ virSCSIDeviceGetAdapterId(const char *adapter, return -1; } -char * -virSCSIDeviceGetSgName(const char *sysfs_prefix, - const char *adapter, - unsigned int bus, - unsigned int target, - unsigned long long unit) +VIR_MOCKABLE(char *, + virSCSIDeviceGetSgName, + const char *sysfs_prefix, + const char *adapter, + unsigned int bus, + unsigned int target, + unsigned long long unit) { DIR *dir = NULL; struct dirent *entry; diff --git a/src/util/virscsi.h b/src/util/virscsi.h index eed563d..7d88d4e 100644 --- a/src/util/virscsi.h +++ b/src/util/virscsi.h @@ -37,7 +37,7 @@ char *virSCSIDeviceGetSgName(const char *sysfs_prefix, const char *adapter, unsigned int bus, unsigned int target, - unsigned long long unit) ATTRIBUTE_MOCKABLE; + unsigned long long unit); char *virSCSIDeviceGetDevName(const char *sysfs_prefix, const char *adapter, unsigned int bus, diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index dc7df75..32828f7 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -83,8 +83,9 @@ virSCSIVHostOnceInit(void) VIR_ONCE_GLOBAL_INIT(virSCSIVHost) -int -virSCSIVHostOpenVhostSCSI(int *vhostfd) +VIR_MOCKABLE(int, + virSCSIVHostOpenVhostSCSI, + int *vhostfd) { if (!virFileExists(VHOST_SCSI_DEVICE)) goto error; diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h index f9272a6..6018b83 100644 --- a/src/util/virscsivhost.h +++ b/src/util/virscsivhost.h @@ -61,6 +61,6 @@ void virSCSIVHostDeviceGetUsedBy(virSCSIVHostDevicePtr dev, const char **drv_name, const char **dom_name); void virSCSIVHostDeviceFree(virSCSIVHostDevicePtr dev); -int virSCSIVHostOpenVhostSCSI(int *vhostfd) ATTRIBUTE_MOCKABLE; +int virSCSIVHostOpenVhostSCSI(int *vhostfd); #endif /* __VIR_SCSIHOST_H__ */ diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 6d9b065..07db753 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -38,8 +38,9 @@ * * Create the cancel path given the path to the TPM device */ -char * -virTPMCreateCancelPath(const char *devpath) +VIR_MOCKABLE(char *, + virTPMCreateCancelPath, + const char *devpath) { char *path = NULL; const char *dev; diff --git a/src/util/virtpm.h b/src/util/virtpm.h index 7067bb5..fe71307 100644 --- a/src/util/virtpm.h +++ b/src/util/virtpm.h @@ -22,6 +22,6 @@ #ifndef __VIR_TPM_H__ # define __VIR_TPM_H__ -char *virTPMCreateCancelPath(const char *devpath) ATTRIBUTE_MOCKABLE; +char *virTPMCreateCancelPath(const char *devpath); #endif /* __VIR_TPM_H__ */ diff --git a/src/util/virutil.c b/src/util/virutil.c index e08f9fa..81bfba7 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -884,14 +884,18 @@ char *virGetUserRuntimeDirectory(void) } } -char *virGetUserName(uid_t uid) +VIR_MOCKABLE(char *, + virGetUserName, + uid_t uid) { char *ret; virGetUserEnt(uid, &ret, NULL, NULL, NULL, false); return ret; } -char *virGetGroupName(gid_t gid) +VIR_MOCKABLE(char *, + virGetGroupName, + gid_t gid) { return virGetGroupEnt(gid); } @@ -1340,8 +1344,9 @@ virGetUserRuntimeDirectory(void) } # endif /* ! HAVE_GETPWUID_R && ! WIN32 */ -char * -virGetUserName(uid_t uid ATTRIBUTE_UNUSED) +VIR_MOCKABLE(char *, + virGetUserName, + uid_t uid ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virGetUserName is not available")); @@ -1379,8 +1384,9 @@ virSetUIDGID(uid_t uid ATTRIBUTE_UNUSED, return -1; } -char * -virGetGroupName(gid_t gid ATTRIBUTE_UNUSED) +VIR_MOCKABLE(char *, + virGetGroupName, + gid_t gid ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virGetGroupName is not available")); @@ -1908,12 +1914,16 @@ virGetListenFDs(void) #endif /* WIN32 */ #ifndef WIN32 -long virGetSystemPageSize(void) +VIR_MOCKABLE(long, + virGetSystemPageSize, + void) { return sysconf(_SC_PAGESIZE); } #else /* WIN32 */ -long virGetSystemPageSize(void) +VIR_MOCKABLE(long, + virGetSystemPageSize, + void) { errno = ENOSYS; return -1; @@ -1959,12 +1969,11 @@ virMemoryLimitIsSet(unsigned long long value) * @capped: whether the value must fit into unsigned long * (long long is assumed otherwise) * - * Note: This function is mocked in tests/qemuxml2argvmock.c for test stability - * * Returns the maximum possible memory value in bytes. */ -unsigned long long -virMemoryMaxValue(bool capped) +VIR_MOCKABLE(unsigned long long, + virMemoryMaxValue, + bool capped) { /* On 32-bit machines, our bound is 0xffffffff * KiB. On 64-bit * machines, our bound is off_t (2^63). */ diff --git a/src/util/virutil.h b/src/util/virutil.h index 35e5ca3..3bbe29e 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -139,8 +139,8 @@ char *virGetUserConfigDirectory(void); char *virGetUserCacheDirectory(void); char *virGetUserRuntimeDirectory(void); char *virGetUserShell(uid_t uid); -char *virGetUserName(uid_t uid) ATTRIBUTE_MOCKABLE; -char *virGetGroupName(gid_t gid) ATTRIBUTE_MOCKABLE; +char *virGetUserName(uid_t uid); +char *virGetGroupName(gid_t gid); int virGetGroupList(uid_t uid, gid_t group, gid_t **groups) ATTRIBUTE_NONNULL(3); int virGetUserID(const char *name, @@ -201,12 +201,12 @@ verify((int)VIR_TRISTATE_BOOL_ABSENT == (int)VIR_TRISTATE_SWITCH_ABSENT); unsigned int virGetListenFDs(void); -long virGetSystemPageSize(void) ATTRIBUTE_MOCKABLE; -long virGetSystemPageSizeKB(void) ATTRIBUTE_MOCKABLE; +long virGetSystemPageSize(void); +long virGetSystemPageSizeKB(void); unsigned long long virMemoryLimitTruncate(unsigned long long value); bool virMemoryLimitIsSet(unsigned long long value); -unsigned long long virMemoryMaxValue(bool ulong) ATTRIBUTE_MOCKABLE; +unsigned long long virMemoryMaxValue(bool ulong); /** * VIR_ASSIGN_IS_OVERFLOW: diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 3cbaae0..30de6f5 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -68,8 +68,9 @@ virUUIDGeneratePseudoRandomBytes(unsigned char *buf, * * Returns 0 in case of success and -1 in case of failure */ -int -virUUIDGenerate(unsigned char *uuid) +VIR_MOCKABLE(int, + virUUIDGenerate, + unsigned char *uuid) { int err; diff --git a/src/util/viruuid.h b/src/util/viruuid.h index 3b41b42..5790a17 100644 --- a/src/util/viruuid.h +++ b/src/util/viruuid.h @@ -49,7 +49,7 @@ int virGetHostUUID(unsigned char *host_uuid) ATTRIBUTE_NONNULL(1); int virUUIDIsValid(unsigned char *uuid); -int virUUIDGenerate(unsigned char *uuid) ATTRIBUTE_MOCKABLE; +int virUUIDGenerate(unsigned char *uuid); int virUUIDParse(const char *uuidstr, unsigned char *uuid) -- 2.9.4

2 4

[libvirt] [PATCH 0/2] Revert use of weak symbols
by Daniel P. Berrange 13 Jul '17

13 Jul '17

This series reverts the use of the __weak__ attribute which we did to fix the test suite with CLang. It cause unintended problems elsewhere which are not practical to fix. See the second patch for details. Daniel P. Berrange (2): Revert "internal: don't use weak symbols for Win32 platform" Revert "Prevent more compiler optimization of mockable functions" build-aux/mock-noinline.pl | 2 +- src/check-symfile.pl | 2 +- src/internal.h | 27 +++++---------------------- src/qemu/qemu_capspriv.h | 2 +- src/rpc/virnetsocket.h | 4 ++-- src/util/vircommand.h | 2 +- src/util/vircrypto.h | 2 +- src/util/virfile.h | 2 +- src/util/virhostcpu.h | 4 ++-- src/util/virmacaddr.h | 2 +- src/util/virnetdev.h | 8 ++++---- src/util/virnetdevip.h | 2 +- src/util/virnetdevopenvswitch.h | 2 +- src/util/virnetdevtap.h | 6 +++--- src/util/virnuma.h | 16 ++++++++-------- src/util/virrandom.h | 6 +++--- src/util/virscsi.h | 2 +- src/util/virscsivhost.h | 2 +- src/util/virtpm.h | 2 +- src/util/virutil.h | 10 +++++----- src/util/viruuid.h | 2 +- 21 files changed, 45 insertions(+), 62 deletions(-) -- 2.9.4

4 15

[libvirt] [PATCH] tests: add virjsondata to EXTRA_DIST
by Daniel P. Berrange 13 Jul '17

13 Jul '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix for RPM builds tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 3596b5ff1..efc1a310d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -148,6 +148,7 @@ EXTRA_DIST = \ vircgroupdata \ virconfdata \ virfiledata \ + virjsondata \ virmacmaptestdata \ virmock.h \ virnetdaemondata \ -- 2.13.0

1 0

[libvirt] [PATCH] util: Don't leak linksrc in vircgroup
by Martin Kletzander 13 Jul '17

13 Jul '17

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/vircgroup.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index a53908fc9246..2912fc9be539 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -382,6 +382,8 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, FILE *mounts = NULL; struct mntent entry; char buf[CGROUP_MAX_VAL]; + char *linksrc = NULL; + int ret = -1; mounts = fopen(path, "r"); if (mounts == NULL) { @@ -409,7 +411,6 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, } if (typelen == len && STREQLEN(typestr, tmp, len)) { - char *linksrc; struct stat sb; char *tmp2; @@ -423,35 +424,35 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, VIR_FREE(controller->mountPoint); VIR_FREE(controller->linkPoint); if (VIR_STRDUP(controller->mountPoint, entry.mnt_dir) < 0) - goto error; + goto cleanup; tmp2 = strrchr(entry.mnt_dir, '/'); if (!tmp2) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Missing '/' separator in cgroup mount '%s'"), entry.mnt_dir); - goto error; + goto cleanup; } /* If it is a co-mount it has a filename like "cpu,cpuacct" * and we must identify the symlink path */ if (checkLinks && strchr(tmp2 + 1, ',')) { *tmp2 = '\0'; + VIR_FREE(linksrc); if (virAsprintf(&linksrc, "%s/%s", entry.mnt_dir, typestr) < 0) - goto error; + goto cleanup; *tmp2 = '/'; if (lstat(linksrc, &sb) < 0) { if (errno == ENOENT) { VIR_WARN("Controller %s co-mounted at %s is missing symlink at %s", typestr, entry.mnt_dir, linksrc); - VIR_FREE(linksrc); } else { virReportSystemError(errno, _("Cannot stat %s"), linksrc); - goto error; + goto cleanup; } } else { if (!S_ISLNK(sb.st_mode)) { @@ -459,6 +460,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, linksrc, typestr); } else { controller->linkPoint = linksrc; + linksrc = NULL; } } } @@ -468,13 +470,11 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, } } + ret = 0; + cleanup: + VIR_FREE(linksrc); VIR_FORCE_FCLOSE(mounts); - - return 0; - - error: - VIR_FORCE_FCLOSE(mounts); - return -1; + return ret; } static int -- 2.13.2

2 1

[libvirt] [PATCH 0/7] qemu: Update host-model CPUs on reconnect
by Jiri Denemark 13 Jul '17

13 Jul '17

This series fixes migration of a domain with a host-model CPU started by an old libvirt (< 2.3). https://bugzilla.redhat.com/show_bug.cgi?id=1463957 Jiri Denemark (7): qemu: Add qemuProcessFetchGuestCPU qemu: Add qemuProcessVerifyCPU qemu: Rename qemuProcessUpdateLiveGuestCPU qemu: Add qemuProcessUpdateLiveGuestCPU qemu: Export virQEMUCapsGuestIsNative qemu: Move qemuProcessReconnect to the end of qemu_process.c qemu: Update host-model CPUs on reconnect src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_process.c | 856 ++++++++++++++++++++++++------------------- 3 files changed, 489 insertions(+), 372 deletions(-) -- 2.13.2

2 17

[libvirt] [PATCH] Add support for virtio-net.tx_queue_size
by Michal Privoznik 13 Jul '17

13 Jul '17

https://bugzilla.redhat.com/show_bug.cgi?id=1460323 Just like I've added support for setting rx_queue_size (in c56cdf259 and friends), qemu just gained support for setting tx ring size. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/formatdomain.html.in | 16 +++++++++++++++- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 16 ++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 8 ++++++++ src/qemu/qemu_domain.c | 16 +++++++++++----- ...e.args => qemuxml2argv-net-virtio-rxtxqueuesize.args} | 4 ++-- ...ize.xml => qemuxml2argv-net-virtio-rxtxqueuesize.xml} | 2 +- tests/qemuxml2argvtest.c | 5 +++-- ...e.xml => qemuxml2xmlout-net-virtio-rxtxqueuesize.xml} | 2 +- tests/qemuxml2xmltest.c | 2 +- 13 files changed, 67 insertions(+), 13 deletions(-) rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-rxqueuesize.args => qemuxml2argv-net-virtio-rxtxqueuesize.args} (85%) rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-rxqueuesize.xml => qemuxml2argv-net-virtio-rxtxqueuesize.xml} (93%) rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-virtio-rxqueuesize.xml => qemuxml2xmlout-net-virtio-rxtxqueuesize.xml} (96%) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7f4bc1d21..d37c89eff 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5065,7 +5065,7 @@ qemu-kvm -net nic,model=? /dev/null <source network='default'/> <target dev='vnet1'/> <model type='virtio'/> - <driver name='vhost' txmode='iothread' ioeventfd='on' event_idx='off' queues='5' rx_queue_size='256'> + <driver name='vhost' txmode='iothread' ioeventfd='on' event_idx='off' queues='5' rx_queue_size='256' tx_queue_size='256'> <host csum='off' gso='off' tso4='off' tso6='off' ecn='off' ufo='off' mrg_rxbuf='off'/> <guest csum='off' tso4='off' tso6='off' ecn='off' ufo='off'/> </driver> @@ -5195,6 +5195,20 @@ qemu-kvm -net nic,model=? /dev/null In general you should leave this option alone, unless you are very certain you know what you are doing. </dd> + <dt><code>tx_queue_size</code></dt> + <dd> + The optional <code>tx_queue_size</code> attribute controls + the size of virtio ring for each queue as described above. + The default value is hypervisor dependent and may change + across its releases. Moreover, some hypervisors may pose + some restrictions on actual value. For instance, latest + QEMU (as of 2017-07-13) requires value to be a power of two + from [256, 1024] range. + Since 3.6.0 (QEMU and KVM only) + + In general you should leave this option alone, unless you + are very certain you know what you are doing. + </dd> <dt>virtio options</dt> <dd> For virtio interfaces, diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 77136108a..7e133a8c1 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2702,6 +2702,11 @@ <ref name='positiveInteger'/> </attribute> </optional> + <optional> + <attribute name='tx_queue_size'> + <ref name='positiveInteger'/> + </attribute> + </optional> <optional> <attribute name="txmode"> <choice> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 570cc5c93..7cf638da4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9863,6 +9863,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, char *event_idx = NULL; char *queues = NULL; char *rx_queue_size = NULL; + char *tx_queue_size = NULL; char *str = NULL; char *filter = NULL; char *internal = NULL; @@ -10036,6 +10037,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, event_idx = virXMLPropString(cur, "event_idx"); queues = virXMLPropString(cur, "queues"); rx_queue_size = virXMLPropString(cur, "rx_queue_size"); + tx_queue_size = virXMLPropString(cur, "tx_queue_size"); } else if (xmlStrEqual(cur->name, BAD_CAST "filterref")) { if (filter) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -10433,6 +10435,16 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, } def->driver.virtio.rx_queue_size = q; } + if (tx_queue_size) { + unsigned int q; + if (virStrToLong_uip(tx_queue_size, NULL, 10, &q) < 0) { + virReportError(VIR_ERR_XML_DETAIL, + _("'tx_queue_size' attribute must be positive number: %s"), + tx_queue_size); + goto error; + } + def->driver.virtio.tx_queue_size = q; + } if ((str = virXPathString("string(./driver/host/@csum)", ctxt))) { if ((val = virTristateSwitchTypeFromString(str)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -10630,6 +10642,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(event_idx); VIR_FREE(queues); VIR_FREE(rx_queue_size); + VIR_FREE(tx_queue_size); VIR_FREE(str); VIR_FREE(filter); VIR_FREE(type); @@ -22497,6 +22510,9 @@ virDomainVirtioNetDriverFormat(char **outstr, if (def->driver.virtio.rx_queue_size) virBufferAsprintf(&buf, " rx_queue_size='%u'", def->driver.virtio.rx_queue_size); + if (def->driver.virtio.tx_queue_size) + virBufferAsprintf(&buf, " tx_queue_size='%u'", + def->driver.virtio.tx_queue_size); virDomainVirtioOptionsFormat(&buf, def->virtio); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1baf85453..1cb8b802c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -967,6 +967,7 @@ struct _virDomainNetDef { virTristateSwitch event_idx; unsigned int queues; /* Multiqueue virtio-net */ unsigned int rx_queue_size; + unsigned int tx_queue_size; struct { virTristateSwitch csum; virTristateSwitch gso; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index db9f9b8b1..f502dd464 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -430,6 +430,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "virtio.iommu_platform", "virtio.ats", "loadparm", + "virtio-net.tx_queue_size", ); @@ -1695,6 +1696,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioNet[] = { { "tx", QEMU_CAPS_VIRTIO_TX_ALG }, { "event_idx", QEMU_CAPS_VIRTIO_NET_EVENT_IDX }, { "rx_queue_size", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE }, + { "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE }, { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU }, }; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index fb22815e9..63e792a19 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -416,6 +416,7 @@ typedef enum { QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, /* virtio-*-pci.iommu_platform */ QEMU_CAPS_VIRTIO_PCI_ATS, /* virtio-*-pci.ats */ QEMU_CAPS_LOADPARM, /* -machine loadparm */ + QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, /* virtio-net-*.tx_queue_size */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e290abff6..43fba3b0a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3790,6 +3790,14 @@ qemuBuildNicDevStr(virDomainDefPtr def, } virBufferAsprintf(&buf, ",rx_queue_size=%u", net->driver.virtio.rx_queue_size); } + if (usingVirtio && net->driver.virtio.tx_queue_size) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio tx_queue_size option is not supported with this QEMU binary")); + goto error; + } + virBufferAsprintf(&buf, ",tx_queue_size=%u", net->driver.virtio.tx_queue_size); + } if (usingVirtio && net->mtu) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_HOST_MTU)) { diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ae260de00..b17727811 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3169,11 +3169,17 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, goto cleanup; } - if (STREQ_NULLABLE(net->model, "virtio") && - net->driver.virtio.rx_queue_size & (net->driver.virtio.rx_queue_size - 1)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("rx_queue_size has to be a power of two")); - goto cleanup; + if (STREQ_NULLABLE(net->model, "virtio")) { + if (net->driver.virtio.rx_queue_size & (net->driver.virtio.rx_queue_size - 1)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("rx_queue_size has to be a power of two")); + goto cleanup; + } + if (net->driver.virtio.tx_queue_size & (net->driver.virtio.tx_queue_size - 1)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("tx_queue_size has to be a power of two")); + goto cleanup; + } } if (net->mtu && diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.args similarity index 85% rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.args rename to tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.args index 07c358a02..c78da3d17 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.args @@ -21,7 +21,7 @@ server,nowait \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --device virtio-net-pci,rx_queue_size=512,vlan=0,id=net0,mac=00:11:22:33:44:55,\ -bus=pci.0,addr=0x3 \ +-device virtio-net-pci,rx_queue_size=512,tx_queue_size=1024,vlan=0,id=net0,\ +mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \ -net user,vlan=0,name=hostnet0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.xml similarity index 93% rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.xml rename to tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.xml index d64e31df2..b51931d52 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.xml @@ -22,7 +22,7 @@ <interface type='user'> <mac address='00:11:22:33:44:55'/> <model type='virtio'/> - <driver rx_queue_size='512'/> + <driver rx_queue_size='512' tx_queue_size='1024'/> </interface> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 302c9c892..8ad2ca71b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1146,8 +1146,9 @@ mymain(void) QEMU_CAPS_VIRTIO_S390); DO_TEST("net-virtio-ccw", QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("net-virtio-rxqueuesize", - QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE); + DO_TEST("net-virtio-rxtxqueuesize", + QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, + QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); DO_TEST_PARSE_ERROR("net-virtio-rxqueuesize-invalid-size", NONE); DO_TEST("net-eth", NONE); DO_TEST("net-eth-ifname", NONE); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxqueuesize.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxtxqueuesize.xml similarity index 96% rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxqueuesize.xml rename to tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxtxqueuesize.xml index 78433026c..5c33a58ad 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxqueuesize.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxtxqueuesize.xml @@ -29,7 +29,7 @@ <interface type='user'> <mac address='00:11:22:33:44:55'/> <model type='virtio'/> - <driver rx_queue_size='512'/> + <driver rx_queue_size='512' tx_queue_size='1024'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 79347671f..578b07a95 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -523,7 +523,7 @@ mymain(void) DO_TEST("net-eth-ifname", NONE); DO_TEST("net-eth-hostip", NONE); DO_TEST("net-virtio-network-portgroup", NONE); - DO_TEST("net-virtio-rxqueuesize", NONE); + DO_TEST("net-virtio-rxtxqueuesize", NONE); DO_TEST("net-hostdev", NONE); DO_TEST("net-hostdev-vfio", NONE); DO_TEST("net-midonet", NONE); -- 2.13.0

1 0

[libvirt] [PATCH] cpu_x86: Properly disable unknown CPU features
by Jiri Denemark 13 Jul '17

13 Jul '17

CPU features unknown to a hypervisor will not be present in dataDisabled even though the feature won't naturally be enabled because it is unknown. Thus any features we asked for which are not in dataEnabled should be considered disabled. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_x86.c | 9 +- tests/cputest.c | 1 + .../x86_64-cpuid-Core-i7-5600U-arat-disabled.xml | 5 + .../x86_64-cpuid-Core-i7-5600U-arat-enabled.xml | 8 + .../x86_64-cpuid-Core-i7-5600U-arat-guest.xml | 29 +++ .../x86_64-cpuid-Core-i7-5600U-arat-host.xml | 30 +++ .../x86_64-cpuid-Core-i7-5600U-arat-json.xml | 14 ++ .../x86_64-cpuid-Core-i7-5600U-arat.json | 202 +++++++++++++++++++++ .../x86_64-cpuid-Core-i7-5600U-arat.xml | 41 +++++ 9 files changed, 335 insertions(+), 4 deletions(-) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.json create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.xml diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 53359ff9b..286445421 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2664,12 +2664,11 @@ virCPUx86UpdateLive(virCPUDefPtr cpu, x86DataCopy(&disabled, &dataDisabled->data.x86) < 0) goto cleanup; - x86DataSubtract(&enabled, &model->data); - for (i = 0; i < map->nfeatures; i++) { virCPUx86FeaturePtr feature = map->features[i]; - if (x86DataIsSubset(&enabled, &feature->data)) { + if (x86DataIsSubset(&enabled, &feature->data) && + !x86DataIsSubset(&model->data, &feature->data)) { VIR_DEBUG("Feature '%s' enabled by the hypervisor", feature->name); if (cpu->check == VIR_CPU_CHECK_FULL) virBufferAsprintf(&bufAdded, "%s,", feature->name); @@ -2678,7 +2677,9 @@ virCPUx86UpdateLive(virCPUDefPtr cpu, goto cleanup; } - if (x86DataIsSubset(&disabled, &feature->data)) { + if (x86DataIsSubset(&disabled, &feature->data) || + (x86DataIsSubset(&model->data, &feature->data) && + !x86DataIsSubset(&enabled, &feature->data))) { VIR_DEBUG("Feature '%s' disabled by the hypervisor", feature->name); if (cpu->check == VIR_CPU_CHECK_FULL) virBufferAsprintf(&bufRemoved, "%s,", feature->name); diff --git a/tests/cputest.c b/tests/cputest.c index 89c645e64..ebcade6be 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -991,6 +991,7 @@ mymain(void) DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-4600U", true); DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-4510U", true); DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-5600U", true); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-5600U-arat", true); DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-E6850", true); DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-Q9500", false); DO_TEST_CPUID(VIR_ARCH_X86_64, "FX-8150", false); diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml new file mode 100644 index 000000000..4a0477f78 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml @@ -0,0 +1,5 @@ + +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-enabled.xml new file mode 100644 index 000000000..5cffacef5 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-enabled.xml @@ -0,0 +1,8 @@ + +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x001c0fbb' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml new file mode 100644 index 000000000..877895cf1 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml @@ -0,0 +1,29 @@ +<cpu mode='custom' match='exact'> + <model fallback='forbid'>Broadwell</model> + <vendor>Intel</vendor> + <feature policy='require' name='vme'/> + <feature policy='require' name='ds'/> + <feature policy='require' name='acpi'/> + <feature policy='require' name='ss'/> + <feature policy='require' name='ht'/> + <feature policy='require' name='tm'/> + <feature policy='require' name='pbe'/> + <feature policy='require' name='dtes64'/> + <feature policy='require' name='monitor'/> + <feature policy='require' name='ds_cpl'/> + <feature policy='require' name='vmx'/> + <feature policy='require' name='smx'/> + <feature policy='require' name='est'/> + <feature policy='require' name='tm2'/> + <feature policy='require' name='xtpr'/> + <feature policy='require' name='pdcm'/> + <feature policy='require' name='osxsave'/> + <feature policy='require' name='f16c'/> + <feature policy='require' name='rdrand'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='tsc_adjust'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='pdpe1gb'/> + <feature policy='require' name='abm'/> + <feature policy='require' name='invtsc'/> +</cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml new file mode 100644 index 000000000..9b24941e0 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml @@ -0,0 +1,30 @@ +<cpu> + <arch>x86_64</arch> + <model>Broadwell</model> + <vendor>Intel</vendor> + <feature name='vme'/> + <feature name='ds'/> + <feature name='acpi'/> + <feature name='ss'/> + <feature name='ht'/> + <feature name='tm'/> + <feature name='pbe'/> + <feature name='dtes64'/> + <feature name='monitor'/> + <feature name='ds_cpl'/> + <feature name='vmx'/> + <feature name='smx'/> + <feature name='est'/> + <feature name='tm2'/> + <feature name='xtpr'/> + <feature name='pdcm'/> + <feature name='osxsave'/> + <feature name='f16c'/> + <feature name='rdrand'/> + <feature name='arat'/> + <feature name='tsc_adjust'/> + <feature name='xsaveopt'/> + <feature name='pdpe1gb'/> + <feature name='abm'/> + <feature name='invtsc'/> +</cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml new file mode 100644 index 000000000..4f253fc08 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml @@ -0,0 +1,14 @@ +<cpu mode='custom' match='exact'> + <model fallback='forbid'>Broadwell</model> + <vendor>Intel</vendor> + <feature policy='require' name='vme'/> + <feature policy='require' name='ss'/> + <feature policy='require' name='vmx'/> + <feature policy='require' name='f16c'/> + <feature policy='require' name='rdrand'/> + <feature policy='require' name='hypervisor'/> + <feature policy='require' name='tsc_adjust'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='pdpe1gb'/> + <feature policy='require' name='abm'/> +</cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.json b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.json new file mode 100644 index 000000000..f2aa7f318 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.json @@ -0,0 +1,202 @@ +{ + "return": { + "model": { + "name": "base", + "props": { + "pfthreshold": false, + "pku": false, + "rtm": true, + "tsc_adjust": true, + "tsc-deadline": true, + "xstore-en": false, + "tsc-scale": false, + "sse": true, + "smap": true, + "stepping": 4, + "tce": false, + "kvm_steal_time": true, + "smep": true, + "rdpid": false, + "xcrypt": false, + "sse4_2": true, + "monitor": false, + "sse4_1": true, + "kvm-mmu": false, + "flushbyasid": false, + "kvm-steal-time": true, + "lm": true, + "tsc": true, + "adx": true, + "fxsr": true, + "sha-ni": false, + "tm": false, + "pclmuldq": true, + "xgetbv1": false, + "xstore": false, + "vmcb_clean": false, + "vme": true, + "vendor": "GenuineIntel", + "ffxsr": false, + "de": true, + "avx512f": false, + "pse": true, + "ds-cpl": false, + "tbm": false, + "ia64": false, + "phe-en": false, + "f16c": true, + "ds": false, + "mpx": false, + "tsc-adjust": true, + "aes": true, + "avx2": true, + "pbe": false, + "cx16": true, + "ds_cpl": false, + "movbe": true, + "perfctr-nb": false, + "nrip_save": false, + "kvm_mmu": false, + "ospke": false, + "avx512ifma": false, + "vmx": true, + "sep": true, + "xsaveopt": true, + "sse4a": false, + "avx512dq": false, + "i64": true, + "avx512-4vnniw": false, + "xsave": true, + "erms": true, + "hle": true, + "nodeid_msr": false, + "est": false, + "svm_lock": false, + "xop": false, + "model-id": "Intel(R) Core(TM) i7-5600U CPU @ 2.60GHz", + "abm": true, + "avx512er": false, + "sse4.1": true, + "sse4.2": true, + "pause-filter": false, + "lahf-lm": true, + "kvm-nopiodelay": true, + "cmp_legacy": false, + "acpi": false, + "fma4": false, + "popcnt": true, + "mmx": true, + "osxsave": false, + "pcommit": false, + "avx512pf": false, + "clwb": false, + "dca": false, + "pdcm": false, + "xcrypt-en": false, + "3dnow": false, + "invtsc": false, + "tm2": false, + "hypervisor": true, + "kvmclock-stable-bit": true, + "fxsr-opt": false, + "pcid": true, + "sse4-1": true, + "sse4-2": true, + "avx512-vpopcntdq": false, + "avx512-4fmaps": false, + "pause_filter": false, + "svm-lock": false, + "rdrand": true, + "nrip-save": false, + "avx512vl": false, + "x2apic": true, + "kvmclock": true, + "pge": true, + "family": 6, + "dtes64": false, + "xd": true, + "kvm_pv_eoi": true, + "ace2": false, + "kvm_pv_unhalt": true, + "xtpr": false, + "perfctr_nb": false, + "avx512bw": false, + "nx": true, + "lwp": false, + "msr": true, + "ace2-en": false, + "decodeassists": false, + "perfctr-core": false, + "pn": false, + "fma": true, + "nodeid-msr": false, + "kvm_asyncpf": true, + "clflush": true, + "cx8": true, + "mce": true, + "avx512cd": false, + "cr8legacy": false, + "mca": true, + "pni": true, + "rdseed": true, + "apic": true, + "fsgsbase": true, + "cmp-legacy": false, + "kvm-pv-unhalt": true, + "rdtscp": true, + "mmxext": false, + "cid": false, + "ssse3": true, + "extapic": false, + "pse36": true, + "mtrr": true, + "ibs": false, + "la57": false, + "avx": true, + "syscall": true, + "umip": false, + "invpcid": true, + "avx512vbmi": false, + "kvm-asyncpf": true, + "vmcb-clean": false, + "pmm": false, + "cmov": true, + "perfctr_core": false, + "misalignsse": false, + "clflushopt": false, + "pat": true, + "lbrv": false, + "3dnowprefetch": true, + "fpu": true, + "pae": true, + "wdt": false, + "tsc_scale": false, + "skinit": false, + "fxsr_opt": false, + "kvm_nopiodelay": true, + "pmm-en": false, + "phe": false, + "3dnowext": false, + "osvw": false, + "ht": false, + "pdpe1gb": true, + "kvm-pv-eoi": true, + "npt": false, + "xsavec": false, + "lahf_lm": true, + "pclmulqdq": true, + "svm": false, + "sse3": true, + "sse2": true, + "ss": true, + "topoext": false, + "smx": false, + "bmi1": true, + "bmi2": true, + "xsaves": false, + "model": 61 + } + } + }, + "id": "model-expansion" +} diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.xml new file mode 100644 index 000000000..ecb4a6e15 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.xml @@ -0,0 +1,41 @@ + +<cpudata arch='x86'> + <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000014' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306d4' ebx='0x00100800' ecx='0x7ffafbff' edx='0xbfebfbff'/> + <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/> + <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/> + <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/> + <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/> + <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000006'/> + <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x11142120'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x021c2fbb' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/> + <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000000'/> + <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000000'/> + <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/> + <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/> + <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/> + <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x37692029' ebx='0x3036352d' ecx='0x43205530' edx='0x40205550'/> + <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x362e3220' ebx='0x7a484730' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> + <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/> + <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/> +</cpudata> -- 2.13.1

2 2

[libvirt] [PATCH] virpcimock: Fix memory leak in pci_driver_new
by ZhiPeng Lu 13 Jul '17

13 Jul '17

@driverpath, allocated by virAsprintfQuiet, was not freed and leaked. Signed-off-by: Zhipeng Lu <lu.zhipeng(a)zte.com.cn> --- tests/virpcimock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index e9408aa..dec9e01 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -480,6 +480,7 @@ pci_driver_new(const char *name, int fail, ...) if (VIR_APPEND_ELEMENT_QUIET(pciDrivers, nPCIDrivers, driver) < 0) ABORT_OOM(); + VIR_FREE(driverpath); } static struct pciDriver * -- 1.8.3.1

1 0

[libvirt] [PATCH] qemu: hotplug virtio_scsi over lsilogic when sicsi controller is not present
by Liang Yan 13 Jul '17

13 Jul '17

It may be better to check virtio-scsi controller first since it is supported better in qemu level. Signed-off-by: Liang Yan<lyan(a)suse.com> --- src/qemu/qemu_domain_address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index b5b863fe4..9bec0790f 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -90,10 +90,10 @@ qemuDomainSetSCSIControllerModel(const virDomainDef *def, } else { if (qemuDomainIsPSeries(def)) { *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI; - } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) { - *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC; } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_SCSI)) { *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI; + } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC; } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to determine model for scsi controller")); -- 2.13.2

2 3