[libvirt] [PATCH] Power Hypervisor now with libssh2
by Eduardo Otubo
Hello friends,
This is the new version of phyp driver now using libssh2. I also did
some other changes:
* Added some debug information. Sometimes its worth to know which
command is being executed and where. So I added the PHYP_CMD_DEBUG
macro.
* All the connection startup is now "hard coded" in libssh2. For
example, I need to open the socket and start the connection all by
myself. Not a big deal, but in a near future I am planning to send a
patch to libssh2 to encapsulate all these procedures into functions,
hence, less code, probably less bugs :)
* There is a lot of "out of scope" functions in the bottom of the file.
In the next patch I may put all those together in a phyp_config.[ch] in
order to get things clearer.
What's up next:
* The problem of handling the UUID in a centralized way still remains.
I started to handle this by opening a sftp connection to the HMC system
and transfer my UUID database. But there is an odd behavior that makes
the driver connect OR NOT to some HMC systems.
* CPU management: this feature planned to be released in this version
is not ready yet due to the issue above.
* Storage management.
Vacations:
I'll be on vacations from 26th/august to 14th/september. I'll check my
emails in the meanwhile, but no so often. Anyway, any comments on this
patch are always welcome :)
[]'s
--
Eduardo Otubo
Software Engineer
Linux Technology Center
IBM Systems & Technology Group
Mobile: +55 19 8135 0885
otubo(a)linux.vnet.ibm.com
15 years, 6 months
[libvirt] [PATCH] Remove an unnecessary variable from remoteIOReadMessage().
by Chris Lalancette
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
src/remote_internal.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/remote_internal.c b/src/remote_internal.c
index dd7b31e..b89d45d 100644
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -6942,10 +6942,9 @@ remoteIOReadMessage(virConnectPtr conn, struct private_data *priv,
if (priv->saslconn) {
if (priv->saslDecoded == NULL) {
char encoded[8192];
- unsigned int encodedLen = sizeof(encoded);
int ret, err;
ret = remoteIOReadBuffer(conn, priv, in_open,
- encoded, encodedLen);
+ encoded, sizeof(encoded));
if (ret < 0)
return -1;
if (ret == 0)
--
1.6.0.6
15 years, 6 months
[libvirt] [PATCH] Simple fix of a comment in qemuStringToArgvEnv.
by Chris Lalancette
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
src/qemu_conf.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index f92bcef..273aeca 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -2363,7 +2363,7 @@ static int qemuStringToArgvEnv(const char *args,
curr = next;
}
- /* Iterate over list of args, finding first arg not containining
+ /* Iterate over list of args, finding first arg not containing
* the '=' character (eg, skip over env vars FOO=bar) */
for (envend = 0 ; ((envend < argcount) &&
(strchr(arglist[envend], '=') != NULL));
--
1.6.0.6
15 years, 6 months
[libvirt] [PATCH] Fix up comments for domainXML{To,From}Native.
by Chris Lalancette
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
src/esx/esx_driver.c | 4 ++--
src/lxc_driver.c | 4 ++--
src/phyp/phyp_driver.c | 4 ++--
src/test.c | 4 ++--
src/uml_driver.c | 4 ++--
src/vbox/vbox_tmpl.c | 4 ++--
src/xen_unified.c | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 07afc10..8fad457 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -3061,8 +3061,8 @@ static virDriver esxDriver = {
NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */
esxDomainDumpXML, /* domainDumpXML */
- esxDomainXMLFromNative, /* domainXmlFromNative */
- NULL, /* domainXmlToNative */
+ esxDomainXMLFromNative, /* domainXMLFromNative */
+ NULL, /* domainXMLToNative */
esxListDefinedDomains, /* listDefinedDomains */
esxNumberOfDefinedDomains, /* numOfDefinedDomains */
esxDomainCreate, /* domainCreate */
diff --git a/src/lxc_driver.c b/src/lxc_driver.c
index 0ec1e92..eafd8ba 100644
--- a/src/lxc_driver.c
+++ b/src/lxc_driver.c
@@ -1901,8 +1901,8 @@ static virDriver lxcDriver = {
NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */
lxcDomainDumpXML, /* domainDumpXML */
- NULL, /* domainXmlFromNative */
- NULL, /* domainXmlToNative */
+ NULL, /* domainXMLFromNative */
+ NULL, /* domainXMLToNative */
lxcListDefinedDomains, /* listDefinedDomains */
lxcNumDefinedDomains, /* numOfDefinedDomains */
lxcDomainStart, /* domainCreate */
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 2f8a314..e2a2caf 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -1347,8 +1347,8 @@ virDriver phypDriver = {
NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */
phypDomainDumpXML, /* domainDumpXML */
- NULL, /* domainXmlFromNative */
- NULL, /* domainXmlToNative */
+ NULL, /* domainXMLFromNative */
+ NULL, /* domainXMLToNative */
phypListDefinedDomains, /* listDefinedDomains */
phypNumDefinedDomains, /* numOfDefinedDomains */
NULL, /* domainCreate */
diff --git a/src/test.c b/src/test.c
index 368a3cb..5f1ba62 100644
--- a/src/test.c
+++ b/src/test.c
@@ -4227,8 +4227,8 @@ static virDriver testDriver = {
NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */
testDomainDumpXML, /* domainDumpXML */
- NULL, /* domainXmlFromNative */
- NULL, /* domainXmlToNative */
+ NULL, /* domainXMLFromNative */
+ NULL, /* domainXMLToNative */
testListDefinedDomains, /* listDefinedDomains */
testNumOfDefinedDomains, /* numOfDefinedDomains */
testDomainCreate, /* domainCreate */
diff --git a/src/uml_driver.c b/src/uml_driver.c
index a2b9495..d28cc30 100644
--- a/src/uml_driver.c
+++ b/src/uml_driver.c
@@ -1823,8 +1823,8 @@ static virDriver umlDriver = {
NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */
umlDomainDumpXML, /* domainDumpXML */
- NULL, /* domainXmlFromNative */
- NULL, /* domainXmlToNative */
+ NULL, /* domainXMLFromNative */
+ NULL, /* domainXMLToNative */
umlListDefinedDomains, /* listDefinedDomains */
umlNumDefinedDomains, /* numOfDefinedDomains */
umlDomainStart, /* domainCreate */
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 7270710..c02b18c 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -6426,8 +6426,8 @@ virDriver NAME(Driver) = {
NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */
vboxDomainDumpXML, /* domainDumpXML */
- NULL, /* domainXmlFromNative */
- NULL, /* domainXmlToNative */
+ NULL, /* domainXMLFromNative */
+ NULL, /* domainXMLToNative */
vboxListDefinedDomains, /* listDefinedDomains */
vboxNumOfDefinedDomains, /* numOfDefinedDomains */
vboxDomainCreate, /* domainCreate */
diff --git a/src/xen_unified.c b/src/xen_unified.c
index dfa9ca5..b826198 100644
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -1692,8 +1692,8 @@ static virDriver xenUnifiedDriver = {
NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */
xenUnifiedDomainDumpXML, /* domainDumpXML */
- xenUnifiedDomainXMLFromNative, /* domainXmlFromNative */
- xenUnifiedDomainXMLToNative, /* domainXmlToNative */
+ xenUnifiedDomainXMLFromNative, /* domainXMLFromNative */
+ xenUnifiedDomainXMLToNative, /* domainXMLToNative */
xenUnifiedListDefinedDomains, /* listDefinedDomains */
xenUnifiedNumOfDefinedDomains, /* numOfDefinedDomains */
xenUnifiedDomainCreate, /* domainCreate */
--
1.6.0.6
15 years, 6 months
[libvirt] [PATCH] Fix a double-free in qemudRunLoop()
by Chris Lalancette
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
qemud/qemud.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/qemud/qemud.c b/qemud/qemud.c
index 00b9859..087f5da 100644
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -2270,7 +2270,6 @@ cleanup:
}
VIR_FREE(server->workers);
- free(server->workers);
virMutexUnlock(&server->lock);
return ret;
}
--
1.6.0.6
15 years, 6 months
[libvirt] [PATCH] Don't do virSetConnError when virDrvSupportsFeature is successful.
by Chris Lalancette
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
src/libvirt.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/libvirt.c b/src/libvirt.c
index 4a11688..fa59dc7 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1349,8 +1349,11 @@ virDrvSupportsFeature (virConnectPtr conn, int feature)
}
ret = VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn, feature);
- /* Copy to connection error object for back compatability */
- virSetConnError(conn);
+
+ if (ret < 0)
+ /* Copy to connection error object for back compatability */
+ virSetConnError(conn);
+
return ret;
}
--
1.6.0.6
15 years, 6 months
[libvirt] [PATCH] Fix up 'neccessary -> necessary' in a comment.
by Chris Lalancette
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
src/virterror.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/virterror.c b/src/virterror.c
index 77b295c..e421ab7 100644
--- a/src/virterror.c
+++ b/src/virterror.c
@@ -641,7 +641,7 @@ virRaiseErrorFull(virConnectPtr conn,
/*
* All errors are recorded in thread local storage
* For compatability, public API calls will copy them
- * to the per-connection error object when neccessary
+ * to the per-connection error object when necessary
*/
to = virLastErrorObject();
if (!to)
--
1.6.0.6
15 years, 6 months
[libvirt] [PATCH 2/2] Fix leak in PCI hostdev hot-unplug
by Mark McLoughlin
* src/qemu_driver.c: sync the hostdev hot-unplug code with the disk/net
code.
---
src/qemu_driver.c | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index de31581..2ddcdc0 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -6206,14 +6206,20 @@ static int
qemudDomainDetachHostPciDevice(virConnectPtr conn,
pciFreeDevice(conn, pci);
}
- if (i != --vm->def->nhostdevs)
- memmove(&vm->def->hostdevs[i],
- &vm->def->hostdevs[i+1],
- sizeof(*vm->def->hostdevs) * (vm->def->nhostdevs-i));
- if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) {
- virReportOOMError(conn);
- ret = -1;
+ if (vm->def->nhostdevs > 1) {
+ memmove(vm->def->hostdevs + i,
+ vm->def->hostdevs + i + 1,
+ sizeof(*vm->def->hostdevs) *
+ (vm->def->nhostdevs - (i + 1)));
+ vm->def->nhostdevs--;
+ if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) {
+ /* ignore, harmless */
+ }
+ } else {
+ VIR_FREE(vm->def->hostdevs);
+ vm->def->nhostdevs = 0;
}
+ virDomainHostdevDefFree(detach);
return ret;
}
--
1.6.2.5
15 years, 6 months
[libvirt] [PATCH 1/2] Fix net/disk hot-unplug segfault
by Mark McLoughlin
When we hot-unplug the last device, we're currently double-freeing
the device definition.
Reported by Michal Nowak here:
https://bugzilla.redhat.com/523953
* src/qemu_driver.c: fix double free
---
src/qemu_driver.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index a65334f..de31581 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -5998,7 +5998,7 @@ try_command:
/* ignore, harmless */
}
} else {
- VIR_FREE(vm->def->disks[0]);
+ VIR_FREE(vm->def->disks);
vm->def->ndisks = 0;
}
virDomainDiskDefFree(detach);
@@ -6100,7 +6100,7 @@ qemudDomainDetachNetDevice(virConnectPtr conn,
/* ignore, harmless */
}
} else {
- VIR_FREE(vm->def->nets[0]);
+ VIR_FREE(vm->def->nets);
vm->def->nnets = 0;
}
virDomainNetDefFree(detach);
--
1.6.2.5
15 years, 6 months
[libvirt] virsh migrate with libvirt-0.6.2: failed to start listening VM
by David Wilcox
Hello,
I'm trying to migrate a vm from a fedora 11 host to another fedora 11 host.
Both hosts are on the same subnet. Both machines have identical
architectures. We use an nfs shared storage mounted, but both machines also
have their own hard drives. I get the machines up and running alright.
Here's the printout of virsh when I try to do the migration.
# virsh list
Id Name State
----------------------------------
1 windowsxp running
2 potato running
# virsh migrate 1 qemu+ssh://prodigy/system
Password:
error: operation failed: failed to start listening VM
On the other machine, the log file that gets created under
/var/log/libvirt/qemo/windowsxp.log
LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin /usr/bin/qemu-kvm -S -M pc -m
512 -smp 1 -name windowsxp -uuid 24d2fd62-ed4f-a321-e264-200b347cfa6c
-monitor pty -pidfile /var/run/libvirt/qemu//windowsxp.pid -localtime
-no-acpi -boot c -drive
file=/var/lib/libvirt/images/windowsxp.img,if=ide,index=0,boot=on -drive
file=/aml/iso/windows_xp_sp3.iso,if=ide,media=cdrom,index=2 -net
nic,macaddr=54:52:00:01:f1:06,vlan=0 -net tap,fd=19,vlan=0 -serial pty
-parallel none -usb -usbdevice tablet -vnc 127.0.0.1:0 -soundhw es1370
-incoming tcp:0.0.0.0:49159
qemu: could not open disk image /var/lib/libvirt/images/windowsxp.img
I would think that the virtual machine should copy from the one machine to
the other. Isn't libvirt supposed to copy the image file?
What's even stranger, I've been trying this for awhile. It's failed every
time, except once when it succeded. I don't know what made it succeed in
that case and fail in all the other cases.
Thanks.
15 years, 6 months