mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 22:05:47 +00:00
examples: remove unneeded labels
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
parent
67ded67321
commit
a7c6faa7ee
@ -10,7 +10,6 @@
|
|||||||
static int
|
static int
|
||||||
showHypervisorInfo(virConnectPtr conn)
|
showHypervisorInfo(virConnectPtr conn)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
|
||||||
unsigned long hvVer, major, minor, release;
|
unsigned long hvVer, major, minor, release;
|
||||||
const char *hvType;
|
const char *hvType;
|
||||||
|
|
||||||
@ -20,17 +19,15 @@ showHypervisorInfo(virConnectPtr conn)
|
|||||||
* hypervisor, so check what it returns. */
|
* hypervisor, so check what it returns. */
|
||||||
hvType = virConnectGetType(conn);
|
hvType = virConnectGetType(conn);
|
||||||
if (!hvType) {
|
if (!hvType) {
|
||||||
ret = 1;
|
|
||||||
printf("Failed to get hypervisor type: %s\n",
|
printf("Failed to get hypervisor type: %s\n",
|
||||||
virGetLastErrorMessage());
|
virGetLastErrorMessage());
|
||||||
goto out;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (0 != virConnectGetVersion(conn, &hvVer)) {
|
if (0 != virConnectGetVersion(conn, &hvVer)) {
|
||||||
ret = 1;
|
|
||||||
printf("Failed to get hypervisor version: %s\n",
|
printf("Failed to get hypervisor version: %s\n",
|
||||||
virGetLastErrorMessage());
|
virGetLastErrorMessage());
|
||||||
goto out;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
major = hvVer / 1000000;
|
major = hvVer / 1000000;
|
||||||
@ -44,15 +41,14 @@ showHypervisorInfo(virConnectPtr conn)
|
|||||||
minor,
|
minor,
|
||||||
release);
|
release);
|
||||||
|
|
||||||
out:
|
return 0;
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
showDomains(virConnectPtr conn)
|
showDomains(virConnectPtr conn)
|
||||||
{
|
{
|
||||||
int ret = 0, numNames, numInactiveDomains, numActiveDomains;
|
int numNames, numInactiveDomains, numActiveDomains;
|
||||||
ssize_t i;
|
ssize_t i;
|
||||||
int flags = VIR_CONNECT_LIST_DOMAINS_ACTIVE |
|
int flags = VIR_CONNECT_LIST_DOMAINS_ACTIVE |
|
||||||
VIR_CONNECT_LIST_DOMAINS_INACTIVE;
|
VIR_CONNECT_LIST_DOMAINS_INACTIVE;
|
||||||
@ -64,18 +60,16 @@ showDomains(virConnectPtr conn)
|
|||||||
* unexpected results */
|
* unexpected results */
|
||||||
numActiveDomains = virConnectNumOfDomains(conn);
|
numActiveDomains = virConnectNumOfDomains(conn);
|
||||||
if (numActiveDomains == -1) {
|
if (numActiveDomains == -1) {
|
||||||
ret = 1;
|
|
||||||
printf("Failed to get number of active domains: %s\n",
|
printf("Failed to get number of active domains: %s\n",
|
||||||
virGetLastErrorMessage());
|
virGetLastErrorMessage());
|
||||||
goto out;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
numInactiveDomains = virConnectNumOfDefinedDomains(conn);
|
numInactiveDomains = virConnectNumOfDefinedDomains(conn);
|
||||||
if (numInactiveDomains == -1) {
|
if (numInactiveDomains == -1) {
|
||||||
ret = 1;
|
|
||||||
printf("Failed to get number of inactive domains: %s\n",
|
printf("Failed to get number of inactive domains: %s\n",
|
||||||
virGetLastErrorMessage());
|
virGetLastErrorMessage());
|
||||||
goto out;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("There are %d active and %d inactive domains\n",
|
printf("There are %d active and %d inactive domains\n",
|
||||||
@ -89,10 +83,9 @@ showDomains(virConnectPtr conn)
|
|||||||
&nameList,
|
&nameList,
|
||||||
flags);
|
flags);
|
||||||
if (numNames == -1) {
|
if (numNames == -1) {
|
||||||
ret = 1;
|
|
||||||
printf("Failed to get a list of all domains: %s\n",
|
printf("Failed to get a list of all domains: %s\n",
|
||||||
virGetLastErrorMessage());
|
virGetLastErrorMessage());
|
||||||
goto out;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < numNames; i++) {
|
for (i = 0; i < numNames; i++) {
|
||||||
@ -105,8 +98,7 @@ showDomains(virConnectPtr conn)
|
|||||||
}
|
}
|
||||||
free(nameList);
|
free(nameList);
|
||||||
|
|
||||||
out:
|
return 0;
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -126,10 +118,9 @@ main(int argc, char *argv[])
|
|||||||
conn = virConnectOpenAuth(uri, virConnectAuthPtrDefault, 0);
|
conn = virConnectOpenAuth(uri, virConnectAuthPtrDefault, 0);
|
||||||
|
|
||||||
if (!conn) {
|
if (!conn) {
|
||||||
ret = 1;
|
|
||||||
printf("No connection to hypervisor: %s\n",
|
printf("No connection to hypervisor: %s\n",
|
||||||
virGetLastErrorMessage());
|
virGetLastErrorMessage());
|
||||||
goto out;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
uri = virConnectGetURI(conn);
|
uri = virConnectGetURI(conn);
|
||||||
@ -162,6 +153,5 @@ main(int argc, char *argv[])
|
|||||||
printf("Disconnected from hypervisor\n");
|
printf("Disconnected from hypervisor\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@ showError(virConnectPtr conn)
|
|||||||
err = malloc(sizeof(*err));
|
err = malloc(sizeof(*err));
|
||||||
if (err == NULL) {
|
if (err == NULL) {
|
||||||
printf("Could not allocate memory for error data\n");
|
printf("Could not allocate memory for error data\n");
|
||||||
goto out;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = virConnCopyLastError(conn, err);
|
ret = virConnCopyLastError(conn, err);
|
||||||
@ -37,16 +37,12 @@ showError(virConnectPtr conn)
|
|||||||
|
|
||||||
virResetError(err);
|
virResetError(err);
|
||||||
free(err);
|
free(err);
|
||||||
|
|
||||||
out:
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
showHypervisorInfo(virConnectPtr conn)
|
showHypervisorInfo(virConnectPtr conn)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
|
||||||
unsigned long hvVer, major, minor, release;
|
unsigned long hvVer, major, minor, release;
|
||||||
const char *hvType;
|
const char *hvType;
|
||||||
|
|
||||||
@ -56,17 +52,15 @@ showHypervisorInfo(virConnectPtr conn)
|
|||||||
* hypervisor, so check what it returns. */
|
* hypervisor, so check what it returns. */
|
||||||
hvType = virConnectGetType(conn);
|
hvType = virConnectGetType(conn);
|
||||||
if (hvType == NULL) {
|
if (hvType == NULL) {
|
||||||
ret = 1;
|
|
||||||
printf("Failed to get hypervisor type\n");
|
printf("Failed to get hypervisor type\n");
|
||||||
showError(conn);
|
showError(conn);
|
||||||
goto out;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (virConnectGetVersion(conn, &hvVer) != 0) {
|
if (virConnectGetVersion(conn, &hvVer) != 0) {
|
||||||
ret = 1;
|
|
||||||
printf("Failed to get hypervisor version\n");
|
printf("Failed to get hypervisor version\n");
|
||||||
showError(conn);
|
showError(conn);
|
||||||
goto out;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
major = hvVer / 1000000;
|
major = hvVer / 1000000;
|
||||||
@ -80,8 +74,7 @@ showHypervisorInfo(virConnectPtr conn)
|
|||||||
minor,
|
minor,
|
||||||
release);
|
release);
|
||||||
|
|
||||||
out:
|
return 0;
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -227,9 +220,8 @@ main(int argc, char *argv[])
|
|||||||
AuthData authData;
|
AuthData authData;
|
||||||
|
|
||||||
if (argc != 4) {
|
if (argc != 4) {
|
||||||
ret = 1;
|
|
||||||
printf("Usage: %s <uri> <username> <password>\n", argv[0]);
|
printf("Usage: %s <uri> <username> <password>\n", argv[0]);
|
||||||
goto out;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
uri = argv[1];
|
uri = argv[1];
|
||||||
@ -242,10 +234,9 @@ main(int argc, char *argv[])
|
|||||||
conn = virConnectOpenAuth(uri, &auth, 0);
|
conn = virConnectOpenAuth(uri, &auth, 0);
|
||||||
|
|
||||||
if (NULL == conn) {
|
if (NULL == conn) {
|
||||||
ret = 1;
|
|
||||||
printf("No connection to hypervisor\n");
|
printf("No connection to hypervisor\n");
|
||||||
showError(conn);
|
showError(conn);
|
||||||
goto out;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
uri = virConnectGetURI(conn);
|
uri = virConnectGetURI(conn);
|
||||||
@ -278,6 +269,5 @@ main(int argc, char *argv[])
|
|||||||
printf("Disconnected from hypervisor\n");
|
printf("Disconnected from hypervisor\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user