projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eb75d0e
)
shared: fix build on !x86
author
Shawn Landden
<shawnlandden@gmail.com>
Sat, 20 Jul 2013 17:15:13 +0000
(10:15 -0700)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sun, 21 Jul 2013 01:33:10 +0000
(21:33 -0400)
src/shared/virt.c
patch
|
blob
|
history
diff --git
a/src/shared/virt.c
b/src/shared/virt.c
index
1abd686
..
4f8134a
100644
(file)
--- a/
src/shared/virt.c
+++ b/
src/shared/virt.c
@@
-29,6
+29,8
@@
/* Returns a short identifier for the various VM implementations */
int detect_vm(const char **id) {
+ _cleanup_free_ char *cpuinfo_contents = NULL;
+ int r;
#if defined(__i386__) || defined(__x86_64__)
@@
-67,8
+69,6
@@
int detect_vm(const char **id) {
const char *j, *k;
bool hypervisor;
_cleanup_free_ char *hvtype = NULL;
- _cleanup_free_ char *cpuinfo_contents = NULL;
- int r;
/* Try high-level hypervisor sysfs file first:
*