Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
libvirt
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Libvirt Packaging Team
libvirt
Commits
31a35bc7
Commit
31a35bc7
authored
13 years ago
by
Guido Günther
Browse files
Options
Downloads
Patches
Plain Diff
New patch nodeinfo-remove-superfluous-braces.patch
nodeinfo: remove superfluous braces
parent
17570fc9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/patches/nodeinfo-remove-superfluous-braces.patch
+51
-0
51 additions, 0 deletions
debian/patches/nodeinfo-remove-superfluous-braces.patch
debian/patches/series
+1
-0
1 addition, 0 deletions
debian/patches/series
with
52 additions
and
0 deletions
debian/patches/nodeinfo-remove-superfluous-braces.patch
0 → 100644
+
51
−
0
View file @
31a35bc7
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sat, 11 Jun 2011 18:10:40 +0200
Subject: nodeinfo: remove superflous braces
that break compilation on non intel architectures:
mips:
https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=mips&ver=0.9.2-1&stamp=1307570195
powerpc:
https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=powerpc&ver=0.9.2-1&stamp=1307550913
s390:
https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=s390&ver=0.9.2-1&stamp=1307641748
sparc:
https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=sparc&ver=0.9.2-1&stamp=1307552926
---
src/nodeinfo.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index f55c83e..1fe6ec9 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -248,7 +248,6 @@
int linuxNodeInfoCPUPopulate(FILE *cpuinfo,
&& (*p == '\0' || c_isspace(*p))
&& id > nodeinfo->cores)
nodeinfo->cores = id;
- }
# elif defined(__powerpc__) || \
defined(__powerpc64__)
} else if (STRPREFIX(buf, "clock")) {
@@ -266,7 +265,6 @@
int linuxNodeInfoCPUPopulate(FILE *cpuinfo,
/* Accept trailing fractional part. */
&& (*p == '\0' || *p == '.' || c_isspace(*p)))
nodeinfo->mhz = ui;
- }
# elif defined(__s390__) || \
defined(__s390x__)
} else if (STRPREFIX(buf, "# processors")) {
@@ -289,10 +287,10 @@
int linuxNodeInfoCPUPopulate(FILE *cpuinfo,
* and parsed in next iteration, because it is not in expected
* format and thus lead to error. */
break;
- }
# else
# warning Parser for /proc/cpuinfo needs to be adapted for your architecture
# endif
+ }
}
if (!nodeinfo->cpus) {
--
This diff is collapsed.
Click to expand it.
debian/patches/series
+
1
−
0
View file @
31a35bc7
...
...
@@ -7,3 +7,4 @@ patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
Debianize-libvirt-guests.patch
virsh-Initialize-library-before-calling-virResetLast.patch
Disable-daemon-start-test.patch
nodeinfo-remove-superfluous-braces.patch
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment