[libvirt] [PATCH 0/4] qemu: hostdev: Unify naming
by Andrea Bolognani
I was working on the QEMU hostdev code and the inconsistent
naming used kept making things just that little harder for
me to follow, so I unified it.
Cheers.
Andrea Bolognani (4):
qemu: hostdev: Unify naming for qemuPrepareHost*Devices()
qemu: hostdev: Unify naming for qemuDomainReAttachHost*Devices()
qemu: hostdev: Unify naming for qemuUpdateActiveHost*Devices()
qemu: hostdev: Introduce qemuUpdateActiveHostDevices()
src/qemu/qemu_hostdev.c | 74 ++++++++++++++++++++++++++++++-------------------
src/qemu/qemu_hostdev.h | 36 ++++++++++++------------
src/qemu/qemu_hotplug.c | 13 ++++-----
src/qemu/qemu_process.c | 8 +-----
4 files changed, 72 insertions(+), 59 deletions(-)
--
2.4.3
9 years
[libvirt] [PATCH v2 0/2] tests: Add nodeinfo test data utility scripts
by Andrea Bolognani
Changes from v1:
* use a better approach to copy host data (thanks Martin)
* acknowledge the fact that the scripts require bash
* other small cleanups and improvements
Andrea Bolognani (2):
tests: Add script to display nodeinfo test data
tests: Add script to copy nodeinfo test data from host
tests/nodeinfodata/copy-from-host.sh | 113 +++++++++++++++++++++++++++++++++++
tests/nodeinfodata/display.sh | 113 +++++++++++++++++++++++++++++++++++
2 files changed, 226 insertions(+)
create mode 100755 tests/nodeinfodata/copy-from-host.sh
create mode 100755 tests/nodeinfodata/display.sh
--
2.4.3
9 years, 1 month
[libvirt] outreachy 2015
by mesode akwe
hello!
i am mesode from cameroon and am interested in participating in the
libvirt-designer enhancement project.
where do i go from here?
thanks.
9 years, 1 month
[libvirt] [RFC] Simplifying usage of {Enter, Exit}Monitor and {Begin/End}Job
by Jiri Denemark
Hi all.
Looking at the qemu driver code, we have a lot of code with the
following pattern:
if (doSomething() < 0)
goto cleanup;
if (qemuDomainObjBeginJob() < 0)
goto cleanup;
if (doSomethingElse() < 0)
goto endjob;
qemuDomainObjEnterMonitor();
if (qemuMonitorSomething() < 0) {
qemuDomainObjExitMonitor();
goto endjob;
}
if (qemuMonitorSomethingElse() < 0) {
qemuDomainObjExitMonitor();
goto endjob;
}
if (qemuDomainObjExitMonitor() < 0)
goto endjob;
...
ret = 0;
endjob:
qemuDomainObjEndJob();
cleanup:
...
return ret;
Sometimes qemuDomainObjExitMonitor is in its own label instead of being
explicitly called on every single error path. Sometimes
qemuDomainObjEndJob is called explicitly followed by goto cleanup. In
either case, it's pretty easy to get this wrong. It's too easy to jump
to a wrong label (especially when moving code around) or forget to call
the appropriate exit function before jumping to a label.
So what if we make the code more robust by changing who needs to track
whether we are in a monitor or have a job. Now it's the caller that
tracks it while I think we could teach the job/monitor APIs themselves
to track the state:
bool inJob = false;
bool inMonitor = false;
if (doSomething() < 0)
goto cleanup;
if (qemuDomainObjBeginJob(..., &inJob) < 0)
goto cleanup;
if (doSomethingElse() < 0)
goto cleanup;
qemuDomainObjEnterMonitor(..., &inMonitor);
if (qemuMonitorSomething() < 0)
goto cleanup;
if (qemuMonitorSomethingElse() < 0)
goto cleanup;
if (qemuDomainObjExitMonitor(..., &inMonitor) < 0)
goto cleanup;
...
ret = 0;
cleanup:
if (qemuDomainObjExitMonitor(..., &inMonitor) < 0)
ret = -1;
qemuDomainObjEndJob(..., &inJob);
...
return ret;
It's not a lot shorter or longer but it saves us from jumping to
different labels and it makes sure we always exit the monitor and end
the job.
So is it worth the effort or do you thing it's even worse than before or
do you have any other ideas?
Thanks,
Jirka
9 years, 1 month
[libvirt] [PATCHv2] virsh: fix no error when pass a count <= 0 to setvcpus
by Luyao Huang
https://bugzilla.redhat.com/show_bug.cgi?id=1248277
When count <= 0, the client exit without set an error.
Signed-off-by: Luyao Huang <lhuang(a)redhat.com>
---
v2:
- use vshCommandOptUInt to forbid negative number,
and check if count is zero. (thanks Peter and Andrea)
tools/virsh-domain.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 4191548..3f032f4 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -6873,7 +6873,7 @@ static bool
cmdSetvcpus(vshControl *ctl, const vshCmd *cmd)
{
virDomainPtr dom;
- int count = 0;
+ unsigned int count = 0;
bool ret = false;
bool maximum = vshCommandOptBool(cmd, "maximum");
bool config = vshCommandOptBool(cmd, "config");
@@ -6900,9 +6900,14 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd)
if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
return false;
- if (vshCommandOptInt(ctl, cmd, "count", &count) < 0 || count <= 0)
+ if (vshCommandOptUInt(ctl, cmd, "count", &count) < 0)
goto cleanup;
+ if (count == 0) {
+ vshError(ctl, _("Can't set 0 processors for a VM"));
+ goto cleanup;
+ }
+
/* none of the options were specified */
if (!current && flags == 0) {
if (virDomainSetVcpus(dom, count) != 0)
--
1.8.3.1
9 years, 1 month
[libvirt] [PATCH] tests: Remove unused nodeinfo test data
by Andrea Bolognani
A bunch of files that we don't currently parse, and are very
unlikely to ever start parsing, made their way into the nodeinfo
test data. Get rid of them.
---
tests/nodeinfodata/linux-f21-mustang/cpu/modalias | 1 -
tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver | 1 -
tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro | 1 -
tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias | 1 -
tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver | 1 -
tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro | 1 -
tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings | 1 -
tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings | 1 -
8 files changed, 8 deletions(-)
delete mode 100644 tests/nodeinfodata/linux-f21-mustang/cpu/modalias
delete mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver
delete mode 100644 tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro
delete mode 100644 tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias
delete mode 100644 tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver
delete mode 100644 tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro
delete mode 100644 tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings
delete mode 100644 tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings
diff --git a/tests/nodeinfodata/linux-f21-mustang/cpu/modalias b/tests/nodeinfodata/linux-f21-mustang/cpu/modalias
deleted file mode 100644
index 18bb0b6..0000000
--- a/tests/nodeinfodata/linux-f21-mustang/cpu/modalias
+++ /dev/null
@@ -1 +0,0 @@
-cpu:type:aarch64:feature:,0000,0001,0002
diff --git a/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver b/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver
deleted file mode 100644
index 621e94f..0000000
--- a/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_driver
+++ /dev/null
@@ -1 +0,0 @@
-none
diff --git a/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro b/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro
deleted file mode 100644
index c35a724..0000000
--- a/tests/nodeinfodata/linux-raspberrypi/cpu/cpuidle/current_governor_ro
+++ /dev/null
@@ -1 +0,0 @@
-menu
diff --git a/tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias b/tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias
deleted file mode 100644
index 18bb0b6..0000000
--- a/tests/nodeinfodata/linux-rhelsa-3.19.0-mustang/cpu/modalias
+++ /dev/null
@@ -1 +0,0 @@
-cpu:type:aarch64:feature:,0000,0001,0002
diff --git a/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver b/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver
deleted file mode 100644
index 57d5dd3..0000000
--- a/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_driver
+++ /dev/null
@@ -1 +0,0 @@
-acpi_idle
diff --git a/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro b/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro
deleted file mode 100644
index c35a724..0000000
--- a/tests/nodeinfodata/linux-test8/cpu/cpuidle/current_governor_ro
+++ /dev/null
@@ -1 +0,0 @@
-menu
diff --git a/tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings b/tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings
deleted file mode 100644
index 573541a..0000000
--- a/tests/nodeinfodata/linux-test8/cpu/sched_mc_power_savings
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings b/tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings
deleted file mode 100644
index 573541a..0000000
--- a/tests/nodeinfodata/linux-test8/cpu/sched_smt_power_savings
+++ /dev/null
@@ -1 +0,0 @@
-0
--
2.4.3
9 years, 1 month
[libvirt] [PATCH] conf: Fix error message to use correct parameter
by John Ferlan
Fix a cut-n-paste error from commit id '35eecdde' where the previous
check for max_sectors seems to have been copied, but the error message
parameter not updated to be ioeventfd
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
pushing as trivial
src/conf/domain_conf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 02cc8ad..0c559d2 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7985,7 +7985,7 @@ virDomainControllerDefParseXML(xmlNodePtr node,
if (ioeventfd &&
(def->ioeventfd = virTristateSwitchTypeFromString(ioeventfd)) < 0) {
virReportError(VIR_ERR_XML_ERROR,
- _("Malformed 'ioeventfd' value %s'"), max_sectors);
+ _("Malformed 'ioeventfd' value %s'"), ioeventfd);
goto error;
}
--
2.1.0
9 years, 1 month
[libvirt] gem install ruby-libvirt fails on FreeBSD 10.2
by Rickard von Essen
Hi,
Installing the ruby-libvirt gem fails on FreeBSD 10.2 since it can't locate
the lib and include dir. Installing with:
gem install ruby-libvirt --
--with-libvirt-include=/usr/local/include/libvirt
--with-libvirt-lib=/usr/local/lib/libvirt.so
works fine.
It would be great if this worked out of the box, e.g. detects that it is
building on BSD and applies the above settings as default, or at least it
could be provided as a hint if running make fails to guide ruby noobs, like
me.
Regards,
Rickard von Essen
9 years, 1 month
[libvirt] [PATCH v2] use STRNEQ instead of !STREQ and new syntax-check rule to avoid !STREQ and !STRNEQ
by Ishmanpreet Kaur Khera
used STRNEQ instead of !STREQ to remove inconsistency and
intoduced new syntax-check rule for !STREQ and !STRNEQ so
that we don't end up in the same situation again.
Signed-off-by: Ishmanpreet Kaur Khera <khera.ishman(a)gmail.com>
---
cfg.mk | 18 ++++++++++++++++++
src/bhyve/bhyve_driver.c | 2 +-
src/conf/network_conf.c | 4 ++--
src/conf/nwfilter_conf.c | 2 +-
src/conf/nwfilter_params.c | 2 +-
src/conf/storage_conf.c | 2 +-
src/lxc/lxc_fuse.c | 4 ++--
src/openvz/openvz_driver.c | 2 +-
src/qemu/qemu_command.c | 6 +++---
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_hotplug.c | 2 +-
src/security/security_manager.c | 2 +-
src/security/security_selinux.c | 12 ++++++------
src/storage/storage_backend_logical.c | 2 +-
src/util/virfile.c | 2 +-
src/util/virsystemd.c | 2 +-
src/vz/vz_driver.c | 2 +-
src/vz/vz_sdk.c | 2 +-
src/xen/xend_internal.c | 2 +-
src/xenconfig/xen_sxpr.c | 2 +-
tests/commandtest.c | 10 +++++-----
tests/securityselinuxlabeltest.c | 2 +-
tests/virauthconfigtest.c | 2 +-
tests/virbitmaptest.c | 12 ++++++------
tests/vircgrouptest.c | 2 +-
tests/virkeyfiletest.c | 8 ++++----
tests/virnetsockettest.c | 2 +-
tests/virtypedparamtest.c | 2 +-
tests/viruritest.c | 16 ++++++++--------
29 files changed, 74 insertions(+), 56 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index e436434..7343dfc 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1011,6 +1011,18 @@ sc_prohibit_pthread_create:
halt="avoid using 'pthread_create', use 'virThreadCreate' instead" \
$(_sc_search_regexp)
+sc_prohibit_not_streq:
+ @prohibit='!STREQ' \
+ exclude='exempt from syntax-check' \
+ halt='Use STRNEQ instead of !STREQ' \
+ $(_sc_search_regexp)
+
+sc_prohibit_not_strneq:
+ @prohibit='!STRNEQ' \
+ exclude='exempt from syntax-check' \
+ halt='Use STREQ instead of !STRNEQ' \
+ $(_sc_search_regexp)
+
# We don't use this feature of maint.mk.
prev_version_file = /dev/null
@@ -1213,3 +1225,9 @@ exclude_file_name_regexp--sc_prohibit_sysconf_pagesize = \
exclude_file_name_regexp--sc_prohibit_pthread_create = \
^(cfg\.mk|src/util/virthread\.c|tests/.*)$$
+
+exclude_file_name_regexp--sc_prohibit_not_streq = \
+ ^tests/.*\.[ch]$$
+
+exclude_file_name_regexp--sc_prohibit_not_strneq = \
+ ^tests/.*\.[ch]$$
diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index d44cf2c..e5d56e9 100644
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -197,7 +197,7 @@ bhyveConnectOpen(virConnectPtr conn,
if (conn->uri->server)
return VIR_DRV_OPEN_DECLINED;
- if (!STREQ_NULLABLE(conn->uri->path, "/system")) {
+ if (STRNEQ_NULLABLE(conn->uri->path, "/system")) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unexpected bhyve URI path '%s', try bhyve:///system"),
conn->uri->path);
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index c1cbd76..0ffb325 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -3042,7 +3042,7 @@ virNetworkLoadState(virNetworkObjListPtr nets,
if (!(def = virNetworkDefParseXML(ctxt)))
goto error;
- if (!STREQ(name, def->name)) {
+ if (STRNEQ(name, def->name)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Network config filename '%s'"
" does not match network name '%s'"),
@@ -3152,7 +3152,7 @@ virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets,
if (!(def = virNetworkDefParseFile(configFile)))
goto error;
- if (!STREQ(name, def->name)) {
+ if (STRNEQ(name, def->name)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Network config filename '%s'"
" does not match network name '%s'"),
diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index f7ccb75..ced8eb8 100644
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -3082,7 +3082,7 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters,
nwfilter = virNWFilterObjFindByUUID(nwfilters, def->uuid);
if (nwfilter) {
- if (!STREQ(def->name, nwfilter->def->name)) {
+ if (STRNEQ(def->name, nwfilter->def->name)) {
virReportError(VIR_ERR_OPERATION_FAILED,
_("filter with same UUID but different name "
"('%s') already exists"),
diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index 0ac8baa..b6c6e78 100644
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -444,7 +444,7 @@ virNWFilterVarCombIterEntryAreUniqueEntries(virNWFilterVarCombIterEntryPtr cie,
/* should never occur to step on a NULL here */
return true;
}
- if (!STREQ(virNWFilterVarValueGetNthValue(tmp, cie->curValue),
+ if (STRNEQ(virNWFilterVarValueGetNthValue(tmp, cie->curValue),
virNWFilterVarValueGetNthValue(tmp, i))) {
isSame = false;
break;
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 9dae1a3..9b8abea 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -1873,7 +1873,7 @@ virStoragePoolLoadState(virStoragePoolObjListPtr pools,
if (!(def = virStoragePoolDefParseXML(ctxt)))
goto error;
- if (!STREQ(name, def->name)) {
+ if (STRNEQ(name, def->name)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Storage pool state file '%s' does not match "
"pool name '%s'"),
diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index 34a69cc..862dca3 100644
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -90,7 +90,7 @@ static int lxcProcReaddir(const char *path, void *buf,
off_t offset ATTRIBUTE_UNUSED,
struct fuse_file_info *fi ATTRIBUTE_UNUSED)
{
- if (!STREQ(path, "/"))
+ if (STRNEQ(path, "/"))
return -ENOENT;
filler(buf, ".", NULL, 0);
@@ -103,7 +103,7 @@ static int lxcProcReaddir(const char *path, void *buf,
static int lxcProcOpen(const char *path ATTRIBUTE_UNUSED,
struct fuse_file_info *fi ATTRIBUTE_UNUSED)
{
- if (!STREQ(path, fuse_meminfo_path))
+ if (STRNEQ(path, fuse_meminfo_path))
return -ENOENT;
if ((fi->flags & 3) != O_RDONLY)
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index d78e2f5..b8c0f50 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -2048,7 +2048,7 @@ openvzUpdateDevice(virDomainDefPtr vmdef,
cur = vmdef->fss[pos];
/* We only allow updating the quota */
- if (!STREQ(cur->src, fs->src)
+ if (STRNEQ(cur->src, fs->src)
|| cur->type != fs->type
|| cur->accessmode != fs->accessmode
|| cur->wrpolicy != fs->wrpolicy
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 7b0879d..8824541 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3008,7 +3008,7 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri,
if (transp)
*transp++ = 0;
- if (!STREQ(uri->scheme, scheme)) {
+ if (STRNEQ(uri->scheme, scheme)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid transport/scheme '%s'"), uri->scheme);
goto error;
@@ -10027,7 +10027,7 @@ qemuBuildCommandLine(virConnectPtr conn,
virDomainDiskDefPtr disk = def->disks[i];
if (disk->src->driverName != NULL &&
- !STREQ(disk->src->driverName, "qemu")) {
+ STRNEQ(disk->src->driverName, "qemu")) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unsupported driver name '%s' for disk '%s'"),
disk->src->driverName, disk->src->path);
@@ -12725,7 +12725,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
if (VIR_STRDUP(model, tokens[i]) < 0)
goto cleanup;
- if (!STREQ(model, "qemu32") && !STREQ(model, "qemu64")) {
+ if (STRNEQ(model, "qemu32") && STRNEQ(model, "qemu64")) {
if (!(cpu = qemuInitGuestCPU(dom)))
goto cleanup;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index bdc0e67..890d8ed 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1061,7 +1061,7 @@ qemuDomainDefPostParse(virDomainDefPtr def,
if (!STRPREFIX(def->os.machine, "pc-0.") &&
!STRPREFIX(def->os.machine, "pc-1.") &&
!STRPREFIX(def->os.machine, "pc-i440") &&
- !STREQ(def->os.machine, "pc") &&
+ STRNEQ(def->os.machine, "pc") &&
!STRPREFIX(def->os.machine, "rhel"))
break;
addPCIRoot = true;
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index afc5408..470ab6a 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -783,7 +783,7 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn,
const char *driverName = virDomainDiskGetDriver(disk);
const char *src = virDomainDiskGetSource(disk);
- if (driverName && !STREQ(driverName, "qemu")) {
+ if (driverName && STRNEQ(driverName, "qemu")) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unsupported driver name '%s' for disk '%s'"),
driverName, src);
diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index 5b05a47..07a0522 100644
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -130,7 +130,7 @@ int
virSecurityManagerStackAddNested(virSecurityManagerPtr stack,
virSecurityManagerPtr nested)
{
- if (!STREQ("stack", stack->drv->name))
+ if (STRNEQ("stack", stack->drv->name))
return -1;
return virSecurityStackAddNested(stack, nested);
}
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index c2464c2..80b0886 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -2061,7 +2061,7 @@ virSecuritySELinuxSecurityVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
if (secdef == NULL)
return 0;
- if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) {
+ if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("security label driver mismatch: "
"'%s' model configured for domain, but "
@@ -2092,7 +2092,7 @@ virSecuritySELinuxSetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UN
return 0;
VIR_DEBUG("label=%s", secdef->label);
- if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) {
+ if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("security label driver mismatch: "
"'%s' model configured for domain, but "
@@ -2126,7 +2126,7 @@ virSecuritySELinuxSetSecurityChildProcessLabel(virSecurityManagerPtr mgr ATTRIBU
return 0;
VIR_DEBUG("label=%s", secdef->label);
- if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) {
+ if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("security label driver mismatch: "
"'%s' model configured for domain, but "
@@ -2155,7 +2155,7 @@ virSecuritySELinuxSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBU
if (!secdef || !secdef->label)
return 0;
- if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) {
+ if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("security label driver mismatch: "
"'%s' model configured for domain, but "
@@ -2202,7 +2202,7 @@ virSecuritySELinuxSetSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNU
if (!secdef || !secdef->label)
return 0;
- if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) {
+ if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("security label driver mismatch: "
"'%s' model configured for domain, but "
@@ -2240,7 +2240,7 @@ virSecuritySELinuxClearSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_U
if (!secdef || !secdef->label)
return 0;
- if (!STREQ(SECURITY_SELINUX_NAME, secdef->model)) {
+ if (STRNEQ(SECURITY_SELINUX_NAME, secdef->model)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("security label driver mismatch: "
"'%s' model configured for domain, but "
diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
index f1321db..536e617 100644
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -147,7 +147,7 @@ virStorageBackendLogicalMakeVol(char **const groups,
* (lvs outputs "[$lvname_vorigin] for field "origin" if the
* lv is created with "--virtualsize").
*/
- if (groups[1] && !STREQ(groups[1], "") && (groups[1][0] != '[')) {
+ if (groups[1] && STRNEQ(groups[1], "") && (groups[1][0] != '[')) {
if (VIR_ALLOC(vol->target.backingStore) < 0)
goto cleanup;
diff --git a/src/util/virfile.c b/src/util/virfile.c
index cba00cb5..e5cf2c5 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -1008,7 +1008,7 @@ virFileStripSuffix(char *str, const char *suffix)
if (len < suffixlen)
return 0;
- if (!STREQ(str + len - suffixlen, suffix))
+ if (STRNEQ(str + len - suffixlen, suffix))
return 0;
str[len-suffixlen] = '\0';
diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c
index 54c409d..1354b08 100644
--- a/src/util/virsystemd.c
+++ b/src/util/virsystemd.c
@@ -375,7 +375,7 @@ int virSystemdTerminateMachine(const char *name,
goto cleanup;
if (error.code == VIR_ERR_ERROR &&
- !STREQ_NULLABLE("org.freedesktop.machine1.NoSuchMachine",
+ STRNEQ_NULLABLE("org.freedesktop.machine1.NoSuchMachine",
error.str1)) {
virReportErrorObject(&error);
goto cleanup;
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index f6bb696..6f1cbfb 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -300,7 +300,7 @@ vzConnectOpen(virConnectPtr conn,
return VIR_DRV_OPEN_DECLINED;
/* From this point on, the connection is for us. */
- if (!STREQ_NULLABLE(conn->uri->path, "/system")) {
+ if (STRNEQ_NULLABLE(conn->uri->path, "/system")) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unexpected Virtuozzo URI path '%s', try vz:///system"),
conn->uri->path);
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index c24477c..89c9e89 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -2026,7 +2026,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def)
}
} else {
if (def->os.nBootDevs != 0 ||
- !STREQ_NULLABLE(def->os.init, "/sbin/init") ||
+ STRNEQ_NULLABLE(def->os.init, "/sbin/init") ||
(def->os.initargv != NULL && def->os.initargv[0] != NULL)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index b81c0b7..62ce930 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -2552,7 +2552,7 @@ xenDaemonDomainSetAutostart(virConnectPtr conn,
if (autonode) {
const char *val = (autonode->u.s.car->kind == SEXPR_VALUE
? autonode->u.s.car->u.value : NULL);
- if (!val || (!STREQ(val, "ignore") && !STREQ(val, "start"))) {
+ if (!val || (STRNEQ(val, "ignore") && STRNEQ(val, "start"))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("unexpected value from on_xend_start"));
goto error;
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 033b0eb..7fc9c9d 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -2345,7 +2345,7 @@ xenFormatSxpr(virConnectPtr conn,
/* Only xend <= 3.0.2 wants cdrom config here */
if (xendConfigVersion != XEND_CONFIG_VERSION_3_0_2)
break;
- if (!STREQ(def->disks[i]->dst, "hdc") || !src)
+ if (STRNEQ(def->disks[i]->dst, "hdc") || !src)
break;
virBufferEscapeSexpr(&buf, "(cdrom '%s')", src);
diff --git a/tests/commandtest.c b/tests/commandtest.c
index f001a39..cf5f44a 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -516,7 +516,7 @@ static int test13(const void *unused ATTRIBUTE_UNUSED)
virCommandFree(cmd);
cmd = NULL;
- if (!STREQ(outactual, outexpect)) {
+ if (STRNEQ(outactual, outexpect)) {
virtTestDifference(stderr, outexpect, outactual);
goto cleanup;
}
@@ -580,15 +580,15 @@ static int test14(const void *unused ATTRIBUTE_UNUSED)
if (!jointactual)
goto cleanup;
- if (!STREQ(outactual, outexpect)) {
+ if (STRNEQ(outactual, outexpect)) {
virtTestDifference(stderr, outexpect, outactual);
goto cleanup;
}
- if (!STREQ(erractual, errexpect)) {
+ if (STRNEQ(erractual, errexpect)) {
virtTestDifference(stderr, errexpect, erractual);
goto cleanup;
}
- if (!STREQ(jointactual, jointexpect)) {
+ if (STRNEQ(jointactual, jointexpect)) {
virtTestDifference(stderr, jointexpect, jointactual);
goto cleanup;
}
@@ -666,7 +666,7 @@ static int test16(const void *unused ATTRIBUTE_UNUSED)
goto cleanup;
}
- if (!STREQ(outactual, outexpect)) {
+ if (STRNEQ(outactual, outexpect)) {
virtTestDifference(stderr, outexpect, outactual);
goto cleanup;
}
diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c
index 86660f4..c82b3f2 100644
--- a/tests/securityselinuxlabeltest.c
+++ b/tests/securityselinuxlabeltest.c
@@ -282,7 +282,7 @@ testSELinuxCheckLabels(testSELinuxFile *files, size_t nfiles)
return -1;
}
}
- if (!STREQ_NULLABLE(files[i].context, ctx)) {
+ if (STRNEQ_NULLABLE(files[i].context, ctx)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"File %s context '%s' did not match epected '%s'",
files[i].file, ctx, files[i].context);
diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index d9e05fd..4c380b9 100644
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -60,7 +60,7 @@ static int testAuthLookup(const void *args)
if (data->expect) {
if (!actual ||
- !STREQ(actual, data->expect)) {
+ STRNEQ(actual, data->expect)) {
VIR_WARN("Expected value '%s' for '%s' '%s' '%s', but got '%s'",
data->expect, data->hostname,
data->service, data->credname,
diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index a6e9a38..8e458d2 100644
--- a/tests/virbitmaptest.c
+++ b/tests/virbitmaptest.c
@@ -355,7 +355,7 @@ test6(const void *v ATTRIBUTE_UNUSED)
if (!str)
goto error;
- if (!STREQ(str, ""))
+ if (STRNEQ(str, ""))
goto error;
VIR_FREE(str);
@@ -365,7 +365,7 @@ test6(const void *v ATTRIBUTE_UNUSED)
if (!str)
goto error;
- if (!STREQ(str, "0"))
+ if (STRNEQ(str, "0"))
goto error;
VIR_FREE(str);
@@ -376,7 +376,7 @@ test6(const void *v ATTRIBUTE_UNUSED)
if (!str)
goto error;
- if (!STREQ(str, "0,4-5"))
+ if (STRNEQ(str, "0,4-5"))
goto error;
VIR_FREE(str);
@@ -386,7 +386,7 @@ test6(const void *v ATTRIBUTE_UNUSED)
if (!str)
goto error;
- if (!STREQ(str, "0,4-6"))
+ if (STRNEQ(str, "0,4-6"))
goto error;
VIR_FREE(str);
@@ -399,7 +399,7 @@ test6(const void *v ATTRIBUTE_UNUSED)
if (!str)
goto error;
- if (!STREQ(str, "0,4-6,13-16"))
+ if (STRNEQ(str, "0,4-6,13-16"))
goto error;
VIR_FREE(str);
@@ -410,7 +410,7 @@ test6(const void *v ATTRIBUTE_UNUSED)
if (!str)
goto error;
- if (!STREQ(str, "0,4-6,13-16,62-63"))
+ if (STRNEQ(str, "0,4-6,13-16,62-63"))
goto error;
diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
index 7a87640..731ecc4 100644
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -662,7 +662,7 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED)
}
for (i = 0; i < EXPECTED_NCPUS; i++) {
- if (!STREQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) {
+ if (STRNEQ(params[i].field, VIR_DOMAIN_CPU_STATS_CPUTIME)) {
fprintf(stderr,
"Wrong parameter name value from virCgroupGetPercpuStats at %zu (is: %s)\n",
i, params[i].field);
diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c
index c31d2aa..3908fa8 100644
--- a/tests/virkeyfiletest.c
+++ b/tests/virkeyfiletest.c
@@ -70,17 +70,17 @@ static int testParse(const void *args ATTRIBUTE_UNUSED)
VIR_DEBUG("Missing Value 'Foo.three'");
goto cleanup;
}
- if (!STREQ(virKeyFileGetValueString(kf, "Foo", "one"),
+ if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "one"),
"The first entry is here")) {
VIR_DEBUG("Wrong value for 'Foo.one'");
goto cleanup;
}
- if (!STREQ(virKeyFileGetValueString(kf, "Foo", "two"),
+ if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "two"),
"The second entry")) {
VIR_DEBUG("Wrong value for 'Foo.one'");
goto cleanup;
}
- if (!STREQ(virKeyFileGetValueString(kf, "Foo", "three"),
+ if (STRNEQ(virKeyFileGetValueString(kf, "Foo", "three"),
"The third entry")) {
VIR_DEBUG("Wrong value for 'Foo.one'");
goto cleanup;
@@ -94,7 +94,7 @@ static int testParse(const void *args ATTRIBUTE_UNUSED)
VIR_DEBUG("Missing Value 'Bar.one'");
goto cleanup;
}
- if (!STREQ(virKeyFileGetValueString(kf, "Bar", "one"),
+ if (STRNEQ(virKeyFileGetValueString(kf, "Bar", "one"),
"The first entry in second group")) {
VIR_DEBUG("Wrong value for 'Bar.one'");
goto cleanup;
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index 1ababad..ce9eeab 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -406,7 +406,7 @@ static int testSocketSSH(const void *opaque)
}
buf[rv] = '\0';
- if (!STREQ(buf, data->expectOut)) {
+ if (STRNEQ(buf, data->expectOut)) {
virtTestDifference(stderr, data->expectOut, buf);
goto cleanup;
}
diff --git a/tests/virtypedparamtest.c b/tests/virtypedparamtest.c
index b7bd72f..f4a5792 100644
--- a/tests/virtypedparamtest.c
+++ b/tests/virtypedparamtest.c
@@ -188,7 +188,7 @@ testTypedParamsGetStringList(const void *opaque ATTRIBUTE_UNUSED)
goto cleanup;
continue;
}
- if (!STREQLEN(strings[i], "bar", 3))
+ if (STRNEQLEN(strings[i], "bar", 3))
goto cleanup;
if (strings[i][3] != l++)
goto cleanup;
diff --git a/tests/viruritest.c b/tests/viruritest.c
index 48b5865..e58e353 100644
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -58,13 +58,13 @@ static int testURIParse(const void *args)
if (!(uri = virURIParse(data->uri)))
goto cleanup;
- if (!STREQ(uri->scheme, data->scheme)) {
+ if (STRNEQ(uri->scheme, data->scheme)) {
VIR_DEBUG("Expected scheme '%s', actual '%s'",
data->scheme, uri->scheme);
goto cleanup;
}
- if (!STREQ(uri->server, data->server)) {
+ if (STRNEQ(uri->server, data->server)) {
VIR_DEBUG("Expected server '%s', actual '%s'",
data->server, uri->server);
goto cleanup;
@@ -76,31 +76,31 @@ static int testURIParse(const void *args)
goto cleanup;
}
- if (!STREQ_NULLABLE(uri->path, data->path)) {
+ if (STRNEQ_NULLABLE(uri->path, data->path)) {
VIR_DEBUG("Expected path '%s', actual '%s'",
data->path, uri->path);
goto cleanup;
}
- if (!STREQ_NULLABLE(uri->query, data->query)) {
+ if (STRNEQ_NULLABLE(uri->query, data->query)) {
VIR_DEBUG("Expected query '%s', actual '%s'",
data->query, uri->query);
goto cleanup;
}
- if (!STREQ_NULLABLE(uri->fragment, data->fragment)) {
+ if (STRNEQ_NULLABLE(uri->fragment, data->fragment)) {
VIR_DEBUG("Expected fragment '%s', actual '%s'",
data->fragment, uri->fragment);
goto cleanup;
}
for (i = 0; data->params && data->params[i].name && i < uri->paramsCount; i++) {
- if (!STREQ_NULLABLE(data->params[i].name, uri->params[i].name)) {
+ if (STRNEQ_NULLABLE(data->params[i].name, uri->params[i].name)) {
VIR_DEBUG("Expected param name %zu '%s', actual '%s'",
i, data->params[i].name, uri->params[i].name);
goto cleanup;
}
- if (!STREQ_NULLABLE(data->params[i].value, uri->params[i].value)) {
+ if (STRNEQ_NULLABLE(data->params[i].value, uri->params[i].value)) {
VIR_DEBUG("Expected param value %zu '%s', actual '%s'",
i, data->params[i].value, uri->params[i].value);
goto cleanup;
@@ -123,7 +123,7 @@ static int testURIParse(const void *args)
if (!(uristr = virURIFormat(uri)))
goto cleanup;
- if (!STREQ(uristr, data->uri_out)) {
+ if (STRNEQ(uristr, data->uri_out)) {
VIR_DEBUG("URI did not roundtrip, expect '%s', actual '%s'",
data->uri_out, uristr);
goto cleanup;
--
1.9.1
9 years, 1 month
