- Devel - libvirt List Archives

[libvirt] [PATCH] tests: avoid seclabeltest crash
by Eric Blake 20 Jul '12

20 Jul '12

Commit a56c347 introduced a use of random numbers into seclabel handling, but failed to initialize the random number generator in the testsuite. * tests/seclabeltest.c (main): Initialize randomness. --- Pushing under the build-breaker rule to avoid a SIGSEGV. I don't know if Dan's pending patches for one-shot initializer cleanups will be impacted or make this harder to forget in the future. tests/seclabeltest.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c index 2f65ec1..7283ca1 100644 --- a/tests/seclabeltest.c +++ b/tests/seclabeltest.c @@ -6,6 +6,7 @@ #include <string.h> #include <errno.h> #include "security/security_driver.h" +#include "virrandom.h" int main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) @@ -13,10 +14,14 @@ main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) virSecurityManagerPtr mgr; const char *doi, *model; + if (virThreadInitialize() < 0 || + virRandomInitialize(time(NULL) ^ getpid())) + exit(1); + mgr = virSecurityManagerNew(NULL, "QEMU", false, true, false); if (mgr == NULL) { fprintf (stderr, "Failed to start security driver"); - exit (-1); + exit(1); } model = virSecurityManagerGetModel(mgr); @@ -24,7 +29,7 @@ main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) { fprintf (stderr, "Failed to copy secModel model: %s", strerror (errno)); - exit (-1); + exit(1); } doi = virSecurityManagerGetDOI(mgr); @@ -32,7 +37,7 @@ main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) { fprintf (stderr, "Failed to copy secModel DOI: %s", strerror (errno)); - exit (-1); + exit(1); } virSecurityManagerFree(mgr); -- 1.7.10.4

1 0

[libvirt] [PATCHv2 0/5] Allow to query a guest's hostname
by Guido Günther 20 Jul '12

20 Jul '12

The following patches allow to query a guest's hostname. Once we also have support to set the hostname via the domain's xml we can also print it in "virsh dominfo" by default so I left it out for now. I left the version at 0.9.14. It'd be happy to change this ot 0.10 should we settle for that one. Changes since last time: * drop patch to print hostname in "virsh list" * add remote protocoll support * Addressed Eric's style comments * openvzVEGetStringParam: Let virCommandRun do the error printing and missing error handling * Don't return empty hostnames but raise VIR_ERR_OPERATION_FAILED instead Cheers, -- Guido Guido Günther (5): Add virDomainGetHostname virsh: Add domhostname remote: Provide RPC call for domainGetHostname openvz: Add openvzVEGetStringParam openvz: Implement domainGetHostname include/libvirt/libvirt.h.in | 2 ++ src/driver.h | 6 ++++++ src/libvirt.c | 45 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt_openvz.syms | 2 +- src/libvirt_public.syms | 5 +++++ src/openvz/openvz_driver.c | 42 +++++++++++++++++++++++++++++++++++++++ src/openvz/openvz_util.c | 32 ++++++++++++++++++++++++++++++ src/openvz/openvz_util.h | 1 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 12 ++++++++++- src/remote_protocol-structs | 8 ++++++++ tools/virsh.c | 44 +++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 4 ++++ 13 files changed, 202 insertions(+), 2 deletions(-) -- 1.7.10.4

3 13

[libvirt] [PATCH v2 0/3] Misc changes to SELinux driver
by Daniel P. Berrange 20 Jul '12

20 Jul '12

This is a repost of https://www.redhat.com/archives/libvir-list/2012-May/msg01186.html No changes except to rebase.

2 8

[libvirt] [PATCH 1/5] Add public API to register a callback to be invoked on connection close
by Daniel P. Berrange 20 Jul '12

20 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Define a new virConnectSetCloseCallback() public API which allows registering a callback to be invoked when the connection to a hypervisor is closed. The callback is provided with the reason for the close, which may be 'error', 'eof' or 'keepalive'. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- include/libvirt/libvirt.h.in | 40 +++++++++++++++++++++++-------- src/datatypes.c | 4 ++++ src/datatypes.h | 5 ++++ src/libvirt.c | 53 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 6 +++++ 5 files changed, 98 insertions(+), 10 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index e34438c..74b3f90 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -49,6 +49,17 @@ extern "C" { * defines VIR_ENUM_SENTINELS. Enumerations for bit values do not * have a *_LAST value, but additional bits may be defined. */ +/* + * virFreeCallback: + * @opaque: opaque user data provided at registration + * + * Type for a domain event callback when the event is deregistered and + * need to be freed, @opaque is provided along with the callback at + * registration time + */ +typedef void (*virFreeCallback)(void *opaque); + + /** * virConnect: * @@ -1148,6 +1159,25 @@ int virConnectSetKeepAlive(virConnectPtr conn, int interval, unsigned int count); +typedef enum { + VIR_CONNECT_CLOSE_REASON_ERROR = 1, /* Misc I/O error */ + VIR_CONNECT_CLOSE_REASON_EOF = 2, /* End-of-file from server */ + VIR_CONNECT_CLOSE_REASON_KEEPALIVE = 3, /* Keepalive timer triggered */ + VIR_CONNECT_CLOSE_REASON_CLIENT = 4, /* Client requested it */ + +# ifdef VIR_ENUM_SENTINELS + VIR_CONNECT_CLOSE_REASON_LAST +# endif +} virConnectCloseReason; + +typedef void (*virConnectCloseFunc)(virConnectPtr conn, + int reason, + void *opaque); + +int virConnectSetCloseCallback(virConnectPtr conn, + virConnectCloseFunc cb, + void *opaque, + virFreeCallback freecb); /* * Capabilities of the connection / driver. @@ -2861,16 +2891,6 @@ typedef int (*virConnectDomainEventCallback)(virConnectPtr conn, int detail, void *opaque); -/* - * virFreeCallback: - * @opaque: opaque user data provided at registration - * - * Type for a domain event callback when the event is deregistered and - * need to be freed, @opaque is provided along with the callback at - * registration time - */ -typedef void (*virFreeCallback)(void *opaque); - int virConnectDomainEventRegister(virConnectPtr conn, virConnectDomainEventCallback cb, void *opaque, diff --git a/src/datatypes.c b/src/datatypes.c index d718170..5d415b8 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -115,6 +115,10 @@ virReleaseConnect(virConnectPtr conn) { virMutexLock(&conn->lock); + if (conn->closeOpaque && + conn->closeFreeCallback) + conn->closeFreeCallback(conn->closeOpaque); + virResetError(&conn->err); virURIFree(conn->uri); diff --git a/src/datatypes.h b/src/datatypes.h index fc284d2..af054ac 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -187,6 +187,11 @@ struct _virConnect { virErrorFunc handler; /* associated handlet */ void *userData; /* the user data */ + /* Per-connection close callback */ + virConnectCloseFunc closeCallback; + void *closeOpaque; + virFreeCallback closeFreeCallback; + int refs; /* reference count */ }; diff --git a/src/libvirt.c b/src/libvirt.c index df78e8a..8acb87f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -18613,6 +18613,59 @@ error: /** + * virConnectSetCloseCallback: + * @conn: pointer to connection object + * @cb: callback to invoke upon close + * @opaque: user data to pass to @cb + * @freecb: callback to free @opaque + * + * Registers a callback to be invoked when the connection + * is closed. This callback is invoked when there is any + * condition that causes the socket connection to the + * hypervisor to be closed. + * + * This function is only applicable to hypervisor drivers + * which maintain a persistent open connection. Drivers + * which open a new connection for every operation will + * not invoke this. + * + * The @freecb must not invoke any other libvirt public + * APIs, since it is not called from a re-entrant safe + * context. + * + * Returns 0 on success, -1 on error + */ +int virConnectSetCloseCallback(virConnectPtr conn, + virConnectCloseFunc cb, + void *opaque, + virFreeCallback freecb) +{ + VIR_DEBUG("conn=%p", conn); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + + virMutexLock(&conn->lock); + + if (conn->closeOpaque && + conn->closeFreeCallback) + conn->closeFreeCallback(conn->closeOpaque); + + conn->closeCallback = cb; + conn->closeOpaque = opaque; + conn->closeFreeCallback = freecb; + + virMutexUnlock(&conn->lock); + + return 0; +} + +/** * virDomainSetBlockIoTune: * @dom: pointer to domain object * @disk: path to the block device, or device shorthand diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 2913a81..dab8725 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -544,4 +544,10 @@ LIBVIRT_0.9.13 { virDomainSnapshotRef; } LIBVIRT_0.9.11; + +LIBVIRT_0.9.14 { + global: + virConnectSetCloseCallback; +} LIBVIRT_0.9.13; + # .... define new API here using predicted next version number .... -- 1.7.10.4

2 15

[libvirt] [PATCH 0/3] Updates for Xen error reporting
by Daniel P. Berrange 20 Jul '12

20 Jul '12

This is an update of the previous patch to make Xen use virReportError. Before that can be done, some cleanup in Xen was required

2 6

[libvirt] [PATCH 00/50] Atomic APIs to list objects
by Osier Yang 20 Jul '12

20 Jul '12

Except the already supported APIs for domain and domain snapshot, this series add the APIs for all the left objects, including storage pool, storage vol, network, interface, node device, nwfilter, secret. * Storage pool: - Support filtering the returned pool objects by active|inactive, persistent|transient, autostart|no-autostart, and pool types. - New options for virsh, --type to accept multiple pool types. * Storage vol: - Simply returns all the vol objects of a pool. * Network: - Support filtering the results using flags active|inactive, persistent|transient, autostart|no-autostart - New options for virsh. * Interface: - Support filtering the results using flags active|inactive. It's still O(n) underlying, as interface driver doesn't manage the objects itself, but using netcf lib instead. And netcf APIs don't support returning the struct yet. * Node Device: - Support filtering the results using capabilities type of the devices. - Extend --cap to accept multiple capability type. * Network Filter: - Simply returns all the objects. * Secret: - Simply returns all the objects. All the commands are tested with both new libvirt with the APIs support, or old libvirt without the support. By the way, I'm wondering if should split the virsh wood, it's really big now, and still growing up. It might take a bit more time to compile if it's splitted into multiple files (split it by the command group?) though, but it's good for maintaining and eyes (I have a small screen). Any opinions? Osier Yang (50): Fix indentions list: Expose pool type via virStoragePoolGetInfo list: Rename virdomainlist.[ch] for common use list: Define new API virStorageListALlStoragePools list: Add helpers for listing storage pool objects list: Implement the RPC calls for virConnectListAllStoragePools list: Implement listAllStoragePools for storage driver list: Implement listAllStoragePools for test driver list: Add helper to convert strings separated by ',' to array virsh: Fix the wrong doc for pool-list list: Change MATCH for common use in virsh list: Use virConnectListAllStoragePools in virsh virsh: Use vshPrint instead of printf python: Expose virStorageListAllStoragePools to python binding list: Define new API virStoragePoolListAllVolumes list: Implemente RPC calls for virStoragePoolListAllVolumes list: Implement virStoragePoolListAllVolumes for storage driver list: Implement virStoragePoolListAllVolumes for test driver list: Use virStoragePoolListAllVolumes in virsh list: Expose virStoragePoolListAllVolumes to Python binding list: Define new API virConnectListAllNetworks list: Implement RPC calls for virConnectListAllNetworks list: Add helpers to list network objects list: Implement listAllNetworks for network driver list: Implement listAllNetworks for test driver list: Use virConnectListAllNetworks in virsh list: Expose virConnectListAllNetworks to Python binding daemon: Fix the wrong macro name list: Define new API virConnectListAllInterfaces list: Implemente RPC calls for virConnectListAllInterfaces list: Implement listAllInterfaces list: Use virConnectListAllInterfaces in virsh list: Expose virConnectListAllInterfaces to Python binding list: Define new API virConnectListAllNodeDevices list: Implemente RPC calls for virConnectListAllNodeDevices list: Add helpers for listing node devices list: Implement listAllNodeDevices list: Expose virConnectListAllNodeDevices to Python binding virsh: Fix a bug of nodedev-list list: Use virConnectListAllNodeDevices in virsh list: Define new API virConnectListAllNWFilters list: Implement RPC calls for virConnectListAllNWFilters list: Implement listAllNWFilters list: Use virConnectListAllNWFilters in virsh list: Expose virConnectListAllNWFilters to Python binding list: Define new API virConnectListAllSecrets list: Implement RPC calls for virConnectListAllSecrets list: Implement listAllSecrets list: Use virConnectListAllSecrets in virsh list: Expose virConnectListAllSecrets to Python binding daemon/libvirtd.c | 2 +- daemon/remote.c | 382 +++++ include/libvirt/libvirt.h.in | 117 ++- python/generator.py | 11 +- python/libvirt-override-api.xml | 44 +- python/libvirt-override-virConnect.py | 72 + python/libvirt-override-virStoragePool.py | 11 + python/libvirt-override.c | 337 +++++ src/Makefile.am | 8 +- src/conf/domain_conf.c | 2 +- src/conf/storage_conf.h | 19 - src/conf/virdomainlist.c | 222 --- src/conf/virdomainlist.h | 84 -- src/conf/virobjectlist.c | 535 +++++++ src/conf/virobjectlist.h | 162 +++ src/datatypes.h | 48 +- src/driver.h | 35 +- src/interface/netcf_driver.c | 135 ++ src/libvirt.c | 429 ++++++- src/libvirt_private.syms | 6 +- src/libvirt_public.syms | 11 + src/libxl/libxl_driver.c | 4 +- src/lxc/lxc_driver.c | 4 +- src/network/bridge_driver.c | 18 + src/node_device/node_device_driver.c | 16 + src/node_device/node_device_driver.h | 3 + src/node_device/node_device_hal.c | 1 + src/node_device/node_device_udev.c | 1 + src/nwfilter/nwfilter_driver.c | 57 + src/openvz/openvz_driver.c | 4 +- src/qemu/qemu_driver.c | 4 +- src/remote/remote_driver.c | 449 ++++++ src/remote/remote_protocol.x | 78 +- src/remote_protocol-structs | 85 ++ src/secret/secret_driver.c | 58 +- src/storage/storage_driver.c | 88 ++ src/test/test_driver.c | 105 ++- src/uml/uml_driver.c | 4 +- src/vbox/vbox_tmpl.c | 10 +- src/vmware/vmware_driver.c | 4 +- tests/virdrivermoduletest.c | 2 +- tools/virsh.c | 2206 ++++++++++++++++++++++------- tools/virsh.pod | 51 +- 43 files changed, 4982 insertions(+), 942 deletions(-) create mode 100644 python/libvirt-override-virStoragePool.py delete mode 100644 src/conf/virdomainlist.c delete mode 100644 src/conf/virdomainlist.h create mode 100644 src/conf/virobjectlist.c create mode 100644 src/conf/virobjectlist.h Regards, Osier

5 64

[libvirt] [PATCH] Disable NWFilter driver completely when unprivileged
by Daniel P. Berrange 20 Jul '12

20 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Running libvirtd unprivileged results in a warning message from the NWFilter driver virNWFilterSnoopLeaseFileRefresh:1882 : open("/var/run/libvirt/network/nwfilter.ltmp"): No such file or directory Since it requires privileged network access, this driver should not even run when unprivileged. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/nwfilter/nwfilter_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 58d91f9..9034549 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -68,6 +68,9 @@ static int nwfilterDriverStartup(int privileged) { char *base = NULL; + if (!privileged) + return 0; + if (virNWFilterIPAddrMapInit() < 0) return -1; if (virNWFilterLearnInit() < 0) -- 1.7.10.4

2 1

[libvirt] [PATCH v2] storage: netfs and iscsi need option srcSpec for resource discovery
by Guannan Ren 20 Jul '12

20 Jul '12

The option 'srcSpec' to virsh command find-storage-pool-sources is optional for logical type of storage pool, but mandatory for netfs and iscsi type. When missing the option for netfs and iscsi, libvirt reports XML parsing error due to null string option srcSpec. error: Failed to find any netfs pool sources error: (storage_source_specification):1: Document is empty (null) This patch adds a check for it, error info changed to: error: Failed to find any netfs pool sources error: internal error pool type 'netfs' need option \ --srcSpec for source discovery --- src/storage/storage_driver.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index fbc630d..8486fdf 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -458,6 +458,14 @@ storageFindPoolSources(virConnectPtr conn, goto cleanup; } + if ((*srcSpec == '\0') && (backend_type == VIR_STORAGE_POOL_ISCSI || + backend_type == VIR_STORAGE_POOL_NETFS)) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + _("pool type '%s' needs option --srcSpec " + "for source discovery"), type); + goto cleanup; + } + ret = backend->findPoolSources(conn, srcSpec, flags); cleanup: -- 1.7.7.5

2 2

[libvirt] [PATCH] don't make lxc_driver static
by Gao feng 20 Jul '12

20 Jul '12

because it will be used in lxc_process.c below is the error information debug : virDriverLoadModule:66 : Module load lxc error : virDriverLoadModule:78 : failed to load module /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so: undefined symbol: lxc_driver Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index d7f052f..09c64b2 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -72,7 +72,7 @@ static int lxcStartup(int privileged); static int lxcShutdown(void); -static lxc_driver_t *lxc_driver = NULL; +lxc_driver_t *lxc_driver = NULL; /* Functions */ -- 1.7.7.6

2 1

[libvirt] Libvirt/LXC/SystemD/SELinux Hackfest at Linux Plumbers, San Diego
by Daniel P. Berrange 20 Jul '12

20 Jul '12

Hi Folks, This years Linux Plumbers Conference (LPC)[1] is taking place in San Diego in the last week of August (co-located with LinuxCon). Since there is alot of integration between libvirt / LXC / SystemD and SELinux, and many of the key developers from those projects will be at LPC, Lennart proposed we hold a hackfest at LPC on this subject To quote Lennart's blog[2]: "On 28th of August we'll have a hackfest on the topic of closer integration of libvirt, LXC, systemd and SELinux, colocated with LPC in San Diego, California. We'll have a number of key people from these projects participating, including Dan Walsh, Eric Paris, Daniel P. Berrange, Kay Sievers and myself. Topics we'll cover: making Fedora/Linux boot entirely cleanly in normal containers, teaching systemd's control tools minimal container-awareness (such as being able to list all services of all containers in one go, in addition to those running on the host system), unified journal logging across multiple containers, the systemd container interface, auditing and containers, running multiple instances from the same /usr tree, and a lot more... Who should attend? Everybody hacking on the mentioned projects who wants to help integrating them with the goal of turning them into a secure, reliable, powerful container solution for Linux. Who should not attend? If you don't hack on any of these projects, or if you are not interested in closer integration of at least two of these projects. How to register? Just show up. You get extra points however for letting us know in advance (just send us an email). Attendance is free." NB, note the date - 28th of August is the Tuesday - ie the day *before* the main LPC conference programme begins. We have space reserved in the main hotel for the hackfest on this day. Regards, Daniel [1] http://www.linuxplumbersconf.org/2012/ [2] http://0pointer.de/blog/hackfests.html -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] virsh man page - domain-id consistency
by Jan Tomko 20 Jul '12

20 Jul '12

Using 'domain-id' to represent domain name, domain id or uuid, as introduced in the DOMAIN COMMANDS section. --- tools/virsh.pod | 86 +++++++++++++++++++++++++++--------------------------- 1 files changed, 43 insertions(+), 43 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 4bddf15..ed1efde 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -580,11 +580,11 @@ If I<--graceful> is specified, don't resort to extreme measures (e.g. SIGKILL) when the guest doesn't stop after a reasonable timeout; return an error instead. -=item B<domblkstat> I<domain> I<block-device> [I<--human>] +=item B<domblkstat> I<domain-id> I<block-device> [I<--human>] Get device block stats for a running domain. A I<block-device> corresponds to a unique target name (<target dev='name'/>) or source file (<source -file='name'/>) for one of the disk devices attached to I<domain> (see +file='name'/>) for one of the disk devices attached to I<domain-id> (see also B<domblklist> for listing these names). Use I<--human> for a more human readable output. @@ -605,11 +605,11 @@ B<Explanation of fields> (fields appear in the folowing order): flush_total_times - total time flush operations took (ns) <-- other fields provided by hypervisor --> -=item B<domifstat> I<domain> I<interface-device> +=item B<domifstat> I<domain-id> I<interface-device> Get network interface stats for a running domain. -=item B<domif-setlink> I<domain> I<interface-device> I<state> [I<--config>] +=item B<domif-setlink> I<domain-id> I<interface-device> I<state> [I<--config>] Modify link state of the domain's virtual interface. Possible values for state are "up" and "down. If I<--config> is specified, only the persistent @@ -617,7 +617,7 @@ configuration of the domain is modified, for compatibility purposes, I<--persistent> is alias of I<--config>. I<interface-device> can be the interface's target name or the MAC address. -=item B<domif-getlink> I<domain> I<interface-device> [I<--config>] +=item B<domif-getlink> I<domain-id> I<interface-device> [I<--config>] Query link state of the domain's virtual interface. If I<--config> is specified, query the persistent configuration, for compatibility @@ -625,7 +625,7 @@ purposes, I<--persistent> is alias of I<--config>. I<interface-device> can be the interface's target name or the MAC address. -=item B<domiftune> I<domain> I<interface-device> +=item B<domiftune> I<domain-id> I<interface-device> [[I<--config>] [I<--live>] | [I<--current>]] [I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] @@ -646,7 +646,7 @@ Both I<--live> and I<--current> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. -=item B<dommemstat> I<domain> +=item B<dommemstat> I<domain-id> Get memory stats for a running domain. @@ -657,17 +657,17 @@ B<domstate> command says that a domain was paused due to I/O error. The B<domblkerror> command lists all block devices in error state and the error seen on each of them. -=item B<domblkinfo> I<domain> I<block-device> +=item B<domblkinfo> I<domain-id> I<block-device> Get block device size info for a domain. A I<block-device> corresponds to a unique target name (<target dev='name'/>) or source file (<source -file='name'/>) for one of the disk devices attached to I<domain> (see +file='name'/>) for one of the disk devices attached to I<domain-id> (see also B<domblklist> for listing these names). -=item B<domblklist> I<domain> [I<--inactive>] [I<--details>] +=item B<domblklist> I<domain-id> [I<--inactive>] [I<--details>] Print a table showing the brief information of all block devices -associated with I<domain>. If I<--inactive> is specified, query the +associated with I<domain-id>. If I<--inactive> is specified, query the block devices that will be used on the next boot, rather than those currently in use by a running domain. If I<--details> is specified, disk type and device value will also be printed. Other contexts @@ -675,16 +675,16 @@ that require a block device name (such as I<domblkinfo> or I<snapshot-create> for disk snapshots) will accept either target or unique source names printed by this command. -=item B<domiflist> I<domain> [I<--inactive>] +=item B<domiflist> I<domain-id> [I<--inactive>] Print a table showing the brief information of all virtual interfaces -associated with I<domain>. If I<--inactive> is specified, query the +associated with I<domain-id>. If I<--inactive> is specified, query the virtual interfaces that will be used on the next boot, rather than those currently in use by a running domain. Other contexts that require a MAC address of virtual interface (such as I<detach-interface> or I<domif-setlink>) will accept the MAC address printed by this command. -=item B<blockcopy> I<domain> I<path> I<dest> [I<bandwidth>] [I<--shallow>] +=item B<blockcopy> I<domain-id> I<path> I<dest> [I<bandwidth>] [I<--shallow>] [I<--reuse-external>] [I<--raw>] [I<--wait> [I<--verbose] [{I<--pivot> | I<--finish>}] [I<--timeout> B<seconds>] [I<--async>]] @@ -725,7 +725,7 @@ is done cleaning up. I<path> specifies fully-qualified path of the disk. I<bandwidth> specifies copying bandwidth limit in Mbps. -=item B<blockpull> I<domain> I<path> [I<bandwidth>] [I<base>] +=item B<blockpull> I<domain-id> I<path> [I<bandwidth>] [I<base>] [I<--wait> [I<--verbose>] [I<--timeout> B<seconds>] [I<--async]] Populate a disk from its backing image chain. By default, this command @@ -748,19 +748,19 @@ longer until the job is done cleaning up. I<path> specifies fully-qualified path of the disk; it corresponds to a unique target name (<target dev='name'/>) or source file (<source -file='name'/>) for one of the disk devices attached to I<domain> (see +file='name'/>) for one of the disk devices attached to I<domain-id> (see also B<domblklist> for listing these names). I<bandwidth> specifies copying bandwidth limit in Mbps. -=item B<blkdeviotune> I<domain> I<device> +=item B<blkdeviotune> I<domain-id> I<device> [[I<--config>] [I<--live>] | [I<--current>]] [[I<total-bytes-sec>] | [I<read-bytes-sec>] [I<write-bytes-sec>]] [[I<total-iops-sec>] | [I<read-iops-sec>] [I<write-iops-sec>]] -Set or query the block disk io parameters for a block device of I<domain>. +Set or query the block disk io parameters for a block device of I<domain-id>. I<device> specifies a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to -I<domain> (see also B<domblklist> for listing these names). +I<domain-id> (see also B<domblklist> for listing these names). If no limit is specified, it will query current I/O limits setting. Otherwise, alter the limits with these flags: @@ -786,7 +786,7 @@ Both I<--live> and I<--current> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. -=item B<blockjob> I<domain> I<path> { [I<--abort>] [I<--async>] [I<--pivot>] | +=item B<blockjob> I<domain-id> I<path> { [I<--abort>] [I<--async>] [I<--pivot>] | [I<--info>] | [I<bandwidth>] } Manage active block operations. There are three modes: I<--info>, @@ -795,7 +795,7 @@ or I<--pivot> implies I<--abort>. I<path> specifies fully-qualified path of the disk; it corresponds to a unique target name (<target dev='name'/>) or source file (<source -file='name'/>) for one of the disk devices attached to I<domain> (see +file='name'/>) for one of the disk devices attached to I<domain-id> (see also B<domblklist> for listing these names). If I<--abort> is specified, the active job on the specified disk will @@ -807,12 +807,12 @@ If I<--info> is specified, the active job information on the specified disk will be printed. I<bandwidth> can be used to set bandwidth limit for the active job. -=item B<blockresize> I<domain> I<path> I<size> +=item B<blockresize> I<domain-id> I<path> I<size> Resize a block device of domain while the domain is running, I<path> specifies the absolute path of the block device; it corresponds to a unique target name (<target dev='name'/>) or source file (<source -file='name'/>) for one of the disk devices attached to I<domain> (see +file='name'/>) for one of the disk devices attached to I<domain-id> (see also B<domblklist> for listing these names). I<size> is a scaled integer (see B<NOTES> above) which defaults to KiB @@ -838,11 +838,11 @@ Convert a domain name or id to domain UUID Convert a domain name (or UUID) to a domain id -=item B<domjobabort> I<domain-id-or-uuid> +=item B<domjobabort> I<domain-id> Abort the currently running domain job. -=item B<domjobinfo> I<domain-id-or-uuid> +=item B<domjobinfo> I<domain-id> Returns information about jobs running on a domain. @@ -959,7 +959,7 @@ Provide the maximum number of virtual CPUs supported for a guest VM on this connection. If provided, the I<type> parameter must be a valid type attribute for the <domain> element of XML. -=item B<cpu-stats> I<domain> [I<--total>] [I<start>] [I<count>] +=item B<cpu-stats> I<domain-id> [I<--total>] [I<start>] [I<count>] Provide cpu statistics information of a domain. The domain should be running. Default it shows stats for all CPUs, and a total. Use @@ -1045,7 +1045,7 @@ migrated to another host. Get the maximum migration bandwidth (in Mbps) for a domain. -=item B<numatune> I<domain> [I<--mode> B<mode>] [I<--nodeset> B<nodeset>] +=item B<numatune> I<domain-id> [I<--mode> B<mode>] [I<--nodeset> B<nodeset>] [[I<--config>] [I<--live>] | [I<--current>]] Set or get a domain's numa parameters, corresponding to the <numatune> @@ -1470,7 +1470,7 @@ By default the hypervisor will try to pick a suitable shutdown method. To specify an alternative method, the I<--mode> parameter can specify C<acpi> or C<agent>. -=item B<start> I<domain-name> [I<--console>] [I<--paused>] [I<--autodestroy>] +=item B<start> I<domain-name-or-uuid> [I<--console>] [I<--paused>] [I<--autodestroy>] [I<--bypass-cache>] [I<--force-boot>] Start a (previously defined) inactive domain, either from the last @@ -2424,11 +2424,11 @@ used to represent properties of snapshots. =over 4 -=item B<snapshot-create> I<domain> [I<xmlfile>] {[I<--redefine> [I<--current>]] +=item B<snapshot-create> I<domain-id> [I<xmlfile>] {[I<--redefine> [I<--current>]] | [I<--no-metadata>] [I<--halt>] [I<--disk-only>] [I<--reuse-external>] [I<--quiesce>] [I<--atomic>]} -Create a snapshot for domain I<domain> with the properties specified in +Create a snapshot for domain I<domain-id> with the properties specified in I<xmlfile>. Normally, the only properties settable for a domain snapshot are the <name> and <description> elements, as well as <disks> if I<--disk-only> is given; the rest of the fields are @@ -2484,12 +2484,12 @@ a persistent domain. However, for transient domains, snapshot metadata is silently lost when the domain quits running (whether by command such as B<destroy> or by internal guest action). -=item B<snapshot-create-as> I<domain> {[I<--print-xml>] +=item B<snapshot-create-as> I<domain-id> {[I<--print-xml>] | [I<--no-metadata>] [I<--halt>] [I<--reuse-external>]} [I<name>] [I<description>] [I<--disk-only> [I<--quiesce>] [I<--atomic>] [[I<--diskspec>] B<diskspec>]...] -Create a snapshot for domain I<domain> with the given <name> and +Create a snapshot for domain I<domain-id> with the given <name> and <description>; if either value is omitted, libvirt will choose a value. If I<--print-xml> is specified, then XML appropriate for I<snapshot-create> is output, rather than actually creating a snapshot. @@ -2503,7 +2503,7 @@ arguments to add <disk> elements to the xml. Each <diskspec> is in the form B<disk[,snapshot=type][,driver=type][,file=name]>. To include a literal comma in B<disk> or in B<file=name>, escape it with a second comma. A literal I<--diskspec> must preceed each B<diskspec> unless -all three of I<domain>, I<name>, and I<description> are also present. +all three of I<domain-id>, I<name>, and I<description> are also present. For example, a diskspec of "vda,snapshot=external,file=/path/to,,new" results in the following XML: <disk name='vda' snapshot='external'> @@ -2532,7 +2532,7 @@ this. If this flag is not specified, then some hypervisors may fail after partially performing the action, and B<dumpxml> must be used to see whether any partial changes occurred. -=item B<snapshot-current> I<domain> {[I<--name>] | [I<--security-info>] +=item B<snapshot-current> I<domain-id> {[I<--name>] | [I<--security-info>] | [I<snapshotname>]} Without I<snapshotname>, this will output the snapshot XML for the domain's @@ -2544,7 +2544,7 @@ the XML. With I<snapshotname>, this is a request to make the existing named snapshot become the current snapshot, without reverting the domain. -=item B<snapshot-edit> I<domain> [I<snapshotname>] [I<--current>] +=item B<snapshot-edit> I<domain-id> [I<snapshotname>] [I<--current>] {[I<--rename>] | [I<--clone>]} Edit the XML configuration file for I<snapshotname> of a domain. If @@ -2572,12 +2572,12 @@ a snapshot name must be done with care, since the contents of some snapshots, such as internal snapshots within a single qcow2 file, are accessible only from the original name. -=item B<snapshot-info> I<domain> {I<snapshot> | I<--current>} +=item B<snapshot-info> I<domain-id> {I<snapshot> | I<--current>} Output basic information about a named <snapshot>, or the current snapshot with I<--current>. -=item B<snapshot-list> I<domain> [{I<--parent> | I<--roots> | I<--tree>}] +=item B<snapshot-list> I<domain-id> [{I<--parent> | I<--roots> | I<--tree>}] [{[I<--from>] B<snapshot> | I<--current>} [I<--descendants>]] [I<--metadata>] [I<--no-metadata>] [I<--leaves>] [I<--no-leaves>] @@ -2613,18 +2613,18 @@ a transient domain. Likewise, if I<--no-metadata> is specified, the list will be filtered to just snapshots that exist without the need for libvirt metadata. -=item B<snapshot-dumpxml> I<domain> I<snapshot> [I<--security-info>] +=item B<snapshot-dumpxml> I<domain-id> I<snapshot> [I<--security-info>] Output the snapshot XML for the domain's snapshot named I<snapshot>. Using I<--security-info> will also include security sensitive information. Use B<snapshot-current> to easily access the XML of the current snapshot. -=item B<snapshot-parent> I<domain> {I<snapshot> | I<--current>} +=item B<snapshot-parent> I<domain-id> {I<snapshot> | I<--current>} Output the name of the parent snapshot, if any, for the given I<snapshot>, or for the current snapshot with I<--current>. -=item B<snapshot-revert> I<domain> {I<snapshot> | I<--current>} +=item B<snapshot-revert> I<domain-id> {I<snapshot> | I<--current>} [{I<--running> | I<--paused>}] [I<--force>] Revert the given domain to the snapshot specified by I<snapshot>, or to @@ -2658,7 +2658,7 @@ snapshot that uses a provably incompatible configuration, as well as with an inactive snapshot that is combined with the I<--start> or I<--pause> flag. -=item B<snapshot-delete> I<domain> {I<snapshot> | I<--current>} [I<--metadata>] +=item B<snapshot-delete> I<domain-id> {I<snapshot> | I<--current>} [I<--metadata>] [{I<--children> | I<--children-only>}] Delete the snapshot for the domain named I<snapshot>, or the current @@ -2761,9 +2761,9 @@ attaching to an externally launched QEMU process. There may be issues with the guest ABI changing upon migration, and hotunplug may not work. -=item B<qemu-monitor-command> I<domain> [I<--hmp>] I<command>... +=item B<qemu-monitor-command> I<domain-id> [I<--hmp>] I<command>... -Send an arbitrary monitor command I<command> to domain I<domain> through the +Send an arbitrary monitor command I<command> to domain I<domain-id> through the qemu monitor. The results of the command will be printed on stdout. If I<--hmp> is passed, the command is considered to be a human monitor command and libvirt will automatically convert it into QMP if needed. In that case -- 1.7.8.6

3 2

[libvirt] [PATCH v3 2/2] ESX: Add routines to interface driver- Use ATTRIBUTE_UNUSED for unused variable.
by Ata E Husain Bohra 20 Jul '12

20 Jul '12

--- src/esx/esx_interface_driver.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index b1ba5e2..01caed0 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -107,10 +107,8 @@ cleanup: static int -esxNumOfDefinedInterfaces(virConnectPtr conn) +esxNumOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED) { - conn->interfacePrivateData = NULL; - // ESX interfaces are always active return 0; } @@ -162,14 +160,10 @@ esxListInterfaces(virConnectPtr conn, char **names, int maxnames) static int -esxListDefinedInterfaces(virConnectPtr conn, char **names, int maxnames) +esxListDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED, + char **names ATTRIBUTE_UNUSED, + int maxnames ATTRIBUTE_UNUSED) { - conn->interfacePrivateData = conn->privateData; - *names = NULL; - - /* keeps compiler happy */ - VIR_DEBUG("max interfaces: %d", maxnames); - // ESX interfaces are always active return 0; } -- 1.7.9.5

1 0

[libvirt] [PATCH v3 1/2] ESX: Add routines to interface driver
by Ata E Husain Bohra 20 Jul '12

20 Jul '12

Add following routines to esx_interface_driver: esxNumOfInterfaces, esxNumOfDefinedInterfaces, esxListInterfaces, esxListDefinedInterfaces, esxInterfaceLookupByMACString, esxInterfaceGetXMLDesc, esxInterfaceUndefine, esxInterfaceCreate, esxInterfaceDestroy Signed-off-by: Ata E Husain Bohra <ata.husain(a)hotmail.com> --- src/esx/esx_interface_driver.c | 506 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi.c | 126 ++++++++++ src/esx/esx_vi.h | 10 + src/esx/esx_vi_generator.input | 227 ++++++++++++++++++ src/esx/esx_vi_generator.py | 31 ++- src/esx/esx_vi_types.c | 18 +- 6 files changed, 913 insertions(+), 5 deletions(-) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 5713137..b1ba5e2 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -23,6 +23,9 @@ */ #include <config.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> #include "internal.h" #include "util.h" @@ -34,6 +37,7 @@ #include "esx_vi.h" #include "esx_vi_methods.h" #include "esx_util.h" +#include "interface_conf.h" #define VIR_FROM_THIS VIR_FROM_ESX @@ -67,10 +71,508 @@ esxInterfaceClose(virConnectPtr conn) +static int +esxNumOfInterfaces(virConnectPtr conn) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + int count = 0; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNic List")); + + goto cleanup; + } + + for (virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + count++; + } + +cleanup: + + esxVI_HostVirtualNic_Free(&virtualNicList); + + return count; +} + + + +static int +esxNumOfDefinedInterfaces(virConnectPtr conn) +{ + conn->interfacePrivateData = NULL; + + // ESX interfaces are always active + return 0; +} + + + +static int +esxListInterfaces(virConnectPtr conn, char **names, int maxnames) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + int result = -1; + int i = 0; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, + &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNIC List")); + goto cleanup; + } + + for (i= 0, virtualNic = virtualNicList; + virtualNic != NULL && i < maxnames; + ++i, virtualNic = virtualNic->_next) { + names[i] = strdup(virtualNic->device); + + if (names[i] == NULL) { + for(;i >=0;--i) { + VIR_FREE(names[i]); + } + virReportOOMError(); + goto cleanup; + } + } + + result = i; + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + + return result; +} + + + +static int +esxListDefinedInterfaces(virConnectPtr conn, char **names, int maxnames) +{ + conn->interfacePrivateData = conn->privateData; + *names = NULL; + + /* keeps compiler happy */ + VIR_DEBUG("max interfaces: %d", maxnames); + + // ESX interfaces are always active + return 0; +} + + + +static virInterfacePtr +esxInterfaceLookupByName(virConnectPtr conn, const char *name) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + virInterfacePtr ret = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, + &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNIC List")); + goto cleanup; + } + + + for(virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + if (STREQ(virtualNic->device, name)) { + if (virtualNic->spec == NULL || + virtualNic->spec->mac == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed HostVirtualNicSpec")); + goto cleanup; + } + + ret = virGetInterface(conn, virtualNic->device, virtualNic->spec->mac); + break; + } + } + + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + + return ret; +} + + + +static virInterfacePtr +esxInterfaceLookupByMACString(virConnectPtr conn, const char *mac) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + virInterfacePtr ret = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, + &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNIC List")); + goto cleanup; + } + + + for(virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + if (virtualNic->spec == NULL || + virtualNic->spec->mac == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed HostVirtualNicSpec")); + goto cleanup; + } + + if (STREQ(virtualNic->spec->mac, mac)) { + ret = virGetInterface(conn, virtualNic->device, virtualNic->spec->mac); + break; + } + } + + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + + return ret; +} + + + +static char* +esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) +{ + esxPrivate *priv = iface->conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_PhysicalNic *physicalNicList = NULL; + const esxVI_PhysicalNic *physicalNic = NULL; + esxVI_PhysicalNic *matchingPhysicalNicList = NULL; + esxVI_HostIpRouteConfig *ipRouteConfig = NULL; + esxVI_HostPortGroup *portGroupList = NULL; + esxVI_HostVirtualSwitch *virtualSwitchList = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + virInterfaceDefPtr def = NULL; + int use_static = 0; + struct in_addr addr; + uint32_t host_addr = 0; + int zero_count = 0; + int masklen = 0; + int i = 0; + char *ret = NULL; + + if (VIR_INTERFACE_XML_INACTIVE & flags) { + use_static = 1; + } + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_String_AppendValueListToList(&propertyNameList, + "config.network.vnic\0" + "config.network.ipRouteConfig\0" + "config.network.vswitch\0" + "config.network.pnic\0" + "config.network.portgroup\0") < 0 || + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "config.network.vnic")) { + if (esxVI_HostVirtualNic_CastListFromAnyType( + dynamicProperty->val, &virtualNicList) < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, + "config.network.ipRouteConfig")) { + if (esxVI_HostIpRouteConfig_CastFromAnyType( + dynamicProperty->val, &ipRouteConfig)) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.vswitch")) { + if (esxVI_HostVirtualSwitch_CastListFromAnyType + (dynamicProperty->val, &virtualSwitchList) < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.pnic")) { + if (esxVI_PhysicalNic_CastListFromAnyType( + dynamicProperty->val, &physicalNicList) < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.portgroup")) { + if (esxVI_HostPortGroup_CastListFromAnyType( + dynamicProperty->val, &portGroupList) < 0) { + goto cleanup; + } + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + if (!virtualNicList || + !ipRouteConfig || + !virtualSwitchList || + !portGroupList) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to retrieve network parameters")); + + goto cleanup; + } + + for (virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + if (STREQ(virtualNic->device, iface->name)) { + break; + } + } + + if (virtualNic == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Interface")); + goto cleanup; + } + + if (esxVI_LookupPhysicalNicFromPortGroup(virtualNic->portgroup, + portGroupList, + virtualSwitchList, + physicalNicList, + &matchingPhysicalNicList) < 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("No Physical NIC found matching Virtual NIC's portgroup")); + goto cleanup; + } + + /* + * populate virInterfaceDef object to obtain + * libvirt interface domain xml. + */ + if (VIR_ALLOC(def) < 0) { + virReportOOMError(); + goto cleanup; + } + + def->type = VIR_INTERFACE_TYPE_BRIDGE; + def->name = strdup(virtualNic->device); + if (virtualNic->spec->mtu && virtualNic->spec->mtu->value) { + def->mtu = virtualNic->spec->mtu->value; + } else { + def->mtu = 1500; + } + + def->startmode = VIR_INTERFACE_START_ONBOOT; + + if (!use_static && virtualNic->spec->mac) { + def->mac = strdup(virtualNic->spec->mac); + } + + /* TODO - Handle VLAN (via portgroup?) */ + if (virtualNic->spec->ip->subnetMask && + *virtualNic->spec->ip->subnetMask && + inet_aton(virtualNic->spec->ip->subnetMask, &addr) == 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Error parsing netmask")); + goto cleanup; + } + + host_addr = ntohl(addr.s_addr); + /* Calculate masklen */ + for (i = 0; i < 32; ++i) { + if (host_addr & 0x01) { + break; + } + zero_count++; + host_addr >>= 1; + } + masklen = 32 - zero_count; + + /* append protocol field */ + def->nprotos = 1; + if (VIR_ALLOC_N(def->protos, def->nprotos) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* TODO - Add IPv6 Support */ + for (i = 0; i < def->nprotos; ++i) { + if (VIR_ALLOC(def->protos[i]) < 0) { + goto cleanup; + } + + def->protos[i]->family = strdup("ipv4"); + if (virtualNic->spec->ip->dhcp == 1) { + def->protos[i]->dhcp = 1; + } + def->protos[i]->nips = 1; + if (virtualNic->spec->ip->dhcp != 1 || !use_static) { + if (virtualNic->spec->ip->ipAddress && + *virtualNic->spec->ip->ipAddress) { + int j =0; + if (VIR_ALLOC_N(def->protos[i]->ips, def->protos[i]->nips) + < 0) { + virReportOOMError(); + goto cleanup; + } + + for (j=0; j < def->protos[i]->nips; ++j) { + if (VIR_ALLOC(def->protos[i]->ips[j]) < 0) { + virReportOOMError(); + goto cleanup; + } + def->protos[i]->ips[0]->address = + strdup(virtualNic->spec->ip->ipAddress); + def->protos[i]->ips[0]->prefix = masklen; + def->protos[i]->gateway = + strdup(ipRouteConfig->defaultGateway); + } + } + } + } + + /* Add bridge information */ + def->data.bridge.stp = 0; /* off */ + + /** + * traversing physical nic list twice, first to get total + * interfaces and second to populate interface items. + * Total Complexity ~= O(N); also total physical nics + * cannot be that large number + */ + for (physicalNic = matchingPhysicalNicList, i = 0; physicalNic != NULL; + physicalNic = physicalNic->_next, ++i) { + } + + if ( i > 0) { + if (VIR_ALLOC_N(def->data.bridge.itf, i) < 0) { + virReportOOMError(); + goto cleanup; + } + def->data.bridge.nbItf = i; + for (physicalNic = matchingPhysicalNicList, i = 0; physicalNic != NULL; + physicalNic = physicalNic->_next, ++i) { + virInterfaceDefPtr itf = NULL; + if (VIR_ALLOC(itf) < 0) { + virReportOOMError(); + goto cleanup; + } + itf->type = VIR_INTERFACE_TYPE_ETHERNET; + itf->name = strdup(physicalNic->device); + itf->mac = strdup(physicalNic->mac); + + def->data.bridge.itf[i] = itf; + } + } + + ret = virInterfaceDefFormat(def); + if (!ret) { + goto cleanup; + } + + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_PhysicalNic_Free(&physicalNicList); + esxVI_PhysicalNic_Free(&matchingPhysicalNicList); + esxVI_HostPortGroup_Free(&portGroupList); + esxVI_HostVirtualSwitch_Free(&virtualSwitchList); + esxVI_HostIpRouteConfig_Free(&ipRouteConfig); + esxVI_ObjectContent_Free(&hostSystem); + esxVI_String_Free(&propertyNameList); + virInterfaceDefFree(def); + + return ret; +} + + + +static int +esxInterfaceUndefine(virInterfacePtr iface) +{ + esxPrivate *priv = iface->conn->interfacePrivateData; + + if (esxVI_RemoveVirtualNic( + priv->primary, + priv->primary->hostSystem->configManager->networkSystem, + iface->name) < 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Error deleting interface")); + return -1; + } + + return 0; +} + + + +static int +esxInterfaceCreate(virInterfacePtr iface, unsigned int flags) +{ + iface->conn->interfacePrivateData = NULL; + + virCheckFlags(0, -1); + + /* ESX interfaces are always active */ + return 0; +} + + + +static int +esxInterfaceDestroy(virInterfacePtr iface, unsigned int flags) +{ + iface->conn->interfacePrivateData = NULL; + + virCheckFlags(0, -1); + + /* ESX interfaces can not be deactivated */ + return 1; +} + + + static virInterfaceDriver esxInterfaceDriver = { .name = "ESX", - .open = esxInterfaceOpen, /* 0.7.6 */ - .close = esxInterfaceClose, /* 0.7.6 */ + .open = esxInterfaceOpen, /* 0.7.6 */ + .close = esxInterfaceClose, /* 0.7.6 */ + .numOfInterfaces = esxNumOfInterfaces, /* 0.9.x */ + .numOfDefinedInterfaces = esxNumOfDefinedInterfaces, /* 0.9.x */ + .listInterfaces = esxListInterfaces, /* 0.9.x */ + .listDefinedInterfaces = esxListDefinedInterfaces, /* 0.9.x */ + .interfaceLookupByName = esxInterfaceLookupByName, /* 0.9.x */ + .interfaceLookupByMACString = esxInterfaceLookupByMACString, /* 0.9.x */ + .interfaceGetXMLDesc = esxInterfaceGetXMLDesc, /* 0.9.x */ + .interfaceUndefine = esxInterfaceUndefine, /* 0.9.x */ + .interfaceCreate = esxInterfaceCreate, /* 0.9.x */ + .interfaceDestroy = esxInterfaceDestroy, /* 0.9.x */ }; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 48718b6..80ddb76 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -4523,6 +4523,132 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx, return result; } +int +esxVI_LookupVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** virtualNicList) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent* hostSystem = NULL; + + if (esxVI_String_AppendValueListToList( + &propertyNameList, "config.network.vnic\0") < 0 || + esxVI_LookupHostSystemProperties(ctx, propertyNameList, &hostSystem) < 0) { + goto cleanup; + } + if (hostSystem == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve the HostSystem object")); + + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; + dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "config.network.vnic")) { + if (esxVI_HostVirtualNic_CastListFromAnyType(dynamicProperty->val, + virtualNicList) < 0) { + goto cleanup; + } + break; + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + result = 0; + +cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&hostSystem); + + return result; +} + +int +esxVI_LookupPhysicalNicFromPortGroup( + const char *portgroup, + const esxVI_HostPortGroup *portGroupList, + const esxVI_HostVirtualSwitch *virtualSwitchList, + const esxVI_PhysicalNic *physicalNicList, + esxVI_PhysicalNic **ret_physicalNicList) +{ + int result = -1; + const esxVI_HostPortGroup *portGroup = NULL; + const esxVI_HostVirtualSwitch *virtualSwitch = NULL; + esxVI_PhysicalNic *matchingPhysicalNicList = NULL; + const esxVI_PhysicalNic *physicalNic = NULL; + esxVI_PhysicalNic *tempPhysicalNic = NULL; + const esxVI_String *pnicKey = NULL; + + if (portgroup == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("No Portgroup found!")); + goto cleanup; + } + + /* Go through all the port groups to find the one that matches. */ + for (portGroup = portGroupList; + portGroup != NULL; + portGroup = portGroup->_next) { + if (STREQ(portGroup->spec->name, portgroup)) { + break; + } + } + + if (portGroup == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Host port group")); + goto cleanup; + } + + /* Go through all the virtual switches to find the one that matches */ + for (virtualSwitch = virtualSwitchList; + virtualSwitch != NULL; + virtualSwitch = virtualSwitch->_next) { + if (STREQ(portGroup->spec->vswitchName, virtualSwitch->name)) { + break; + } + } + + if (virtualSwitch == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Virtual Switch")); + goto cleanup; + } + + /* Go through all physical nics */ + for (pnicKey = virtualSwitch->pnic; + pnicKey != NULL; + pnicKey = pnicKey->_next) { + /* O(n^2), but probably faster than a hash due to small N */ + for (physicalNic = physicalNicList; + physicalNic != NULL; + physicalNic = physicalNic->_next) { + + if (STREQ(pnicKey->value, physicalNic->key)) { + if (esxVI_PhysicalNic_DeepCopy(&tempPhysicalNic, + (esxVI_PhysicalNic *)physicalNic) < 0 || + esxVI_PhysicalNic_AppendToList(&matchingPhysicalNicList, + tempPhysicalNic) < 0) { + goto cleanup; + } + tempPhysicalNic = NULL; + } + } + } + + *ret_physicalNicList = matchingPhysicalNicList; + matchingPhysicalNicList = NULL; /* no cleanup needed */ + tempPhysicalNic = NULL; /* no cleanup needed */ + result = 0; + cleanup: + esxVI_PhysicalNic_Free(&matchingPhysicalNicList); + esxVI_PhysicalNic_Free(&tempPhysicalNic); + return result; +} #include "esx_vi.generated.c" diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 9560bd2..9b694b5 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -505,6 +505,16 @@ int esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, int esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersion); +int esxVI_LookupVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** virtualNicList); + +int esxVI_LookupPhysicalNicFromPortGroup( + const char *portgroup, + const esxVI_HostPortGroup *portGroupList, + const esxVI_HostVirtualSwitch *virtualSwitchList, + const esxVI_PhysicalNic *physicalNicList, + esxVI_PhysicalNic **ret_physicalNicList); + # include "esx_vi.generated.h" #endif /* __ESX_VI_H__ */ diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 1a67a8c..64f8389 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -57,6 +57,29 @@ enum AutoStartWaitHeartbeatSetting systemDefault end +enum HostConfigChangeOperation + add + edit + remove +end + +enum HostIpConfigIpV6AdressStatus + deprecated + duplicate + inaccessible + invalid + preferred + tentative + unknown +end + +enum HostIpConfigV6AdressConfigType + dhcp + linklayer + manual + other + random +end enum ManagedEntityStatus gray @@ -197,6 +220,12 @@ object DeviceBackedVirtualDiskSpec extends VirtualDiskSpec String device r end +object DistributedVirtualSwitchPortConnection + Int connectionCookie o + String portgroupKey o + String portKey o + String switchUuid r +end object DynamicProperty String name r @@ -316,6 +345,34 @@ object HostFileSystemVolume Long capacity r end +object HostIpConfig + Boolean dhcp r + String ipAddress o + HostIpConfigIpV6AddressConfiguration ipV6Config o + String subnetMask o +end + +object HostIpConfigIpV6Address + String dadState o + String ipAddress r + DateTime lifetime o + String operation o + String origin o + Int prefixLength r +end + +object HostIpConfigIpV6AddressConfiguration + Boolean autoConfigurationEnabled o + Boolean dhcpV6Enabled o + HostIpConfigIpV6Address ipV6Address ol +end + +object HostIpRouteConfig + String defaultGateway o + String gatewayDevice o + String ipV6DefaultGateway o + String ipV6GatewayDevice o +end object HostMountInfo String path o @@ -331,11 +388,131 @@ object HostNasVolume extends HostFileSystemVolume end +object HostNicTeamingPolicy + String policy o + Boolean reversePolicy o + Boolean notifySwitches o + Boolean rollingOrder o + HostNicFailureCriteria failureCriteria o + HostNicOrderPolicy nicOrder o +end + +object HostNetOffloadCapabilities + Boolean csumOffload o + Boolean tcpSegmentation o + Boolean zeroCopyXmit o +end + +object HostNetworkSecurityPolicy + Boolean allowPromiscuous o + Boolean macChanges o + Boolean forgedTransmits o +end + +object HostNetworkPolicy + HostNetworkSecurityPolicy security o + HostNicTeamingPolicy nicTeaming o + HostNetOffloadCapabilities offloadPolicy o + HostNetworkTrafficShapingPolicy shapingPolicy o +end + +object HostNetworkTrafficShapingPolicy + Boolean enabled o +end + +object HostNicFailureCriteria + String checkSpeed o + Int speed o + Boolean checkDuplex o + Boolean fullDuplex o + Boolean checkErrorPercent o + Int percentage o + Boolean checkBeacon o +end + +object HostNicOrderPolicy + String activeNic ol + String standbyNic ol +end + +object HostPortGroup + String key r + HostPortGroupPort port ol + String vswitch r + HostNetworkPolicy computedPolicy r + HostPortGroupSpec spec r +end + +object HostPortGroupPort + String key o + String mac ol + String type r +end + +object HostPortGroupSpec + String name r + Int vlanId r + String vswitchName r + HostNetworkPolicy policy r +end + object HostScsiDiskPartition String diskName r Int partition r end +object HostVirtualNic + String device r + String key r + String port o + String portgroup r + HostVirtualNicSpec spec r +end + +object HostVirtualNicSpec + DistributedVirtualSwitchPortConnection distributedVirtualPort o + HostIpConfig ip o + String mac o + Int mtu o + String portgroup o + Boolean tsoEnabled o +end + + +object HostVirtualSwitch + String key r + Int mtu o + String name r + Int numPorts r + Int numPortsAvailable r + String pnic ol + String portgroup ol + HostVirtualSwitchSpec spec r +end + +object HostVirtualSwitchBridge +end + +object HostVirtualSwitchAutoBridge extends HostVirtualSwitchBridge + String excludedNicDevice ol +end + +object HostVirtualSwitchBeaconBridge extends HostVirtualSwitchBridge + Int interval r +end + +object HostVirtualSwitchBondBridge extends HostVirtualSwitchBridge + HostVirtualSwitchBeaconBridge beacon o + LinkDiscoveryProtocolConfig linkDiscoveryProtocolConfig o + String nicDevice rl +end + +object HostVirtualSwitchSpec + HostVirtualSwitchBridge bridge o + Int mtu o + Int numPorts r + HostNetworkPolicy policy o +end object HostVmfsVolume extends HostFileSystemVolume Int blockSizeMb r @@ -355,6 +532,10 @@ end object IsoImageFileQuery extends FileQuery end +object LinkDiscoveryProtocolConfig + String operation r + String protocol r +end object LocalDatastoreInfo extends DatastoreInfo String path o @@ -398,6 +579,10 @@ object OptionType Boolean valueIsReadonly o end +object OptionValue + String key r + AnyType value r +end object PerfCounterInfo Int key r @@ -454,6 +639,27 @@ object PerfSampleInfo Int interval r end +object PhysicalNic + String device r + String driver o + String key o + PhysicalNicInfo linkSpeed o + String mac r + String pci r + PhysicalNicSpec spec r + PhysicalNicInfo validLinkSpecification ol + Boolean wakeOnLanSupported r +end + +object PhysicalNicInfo + Boolean duplex r + Int speedMb r +end + +object PhysicalNicSpec + HostIpConfig ip o + PhysicalNicInfo linkSpeed o +end object PropertyChange String name r @@ -773,6 +979,13 @@ end # Methods # +method AddVirtualNic returns String r + ManagedObjectReference _this r + String portgroup r + HostVirtualNicSpec nic r +end + + method AnswerVM ManagedObjectReference _this r String questionId r @@ -954,6 +1167,10 @@ method RemoveSnapshot_Task returns ManagedObjectReference r Boolean removeChildren r end +method RemoveVirtualNic + ManagedObjectReference _this r + String device r +end method RetrieveProperties returns ObjectContent ol ManagedObjectReference _this:propertyCollector r @@ -1002,6 +1219,16 @@ method UnregisterVM ManagedObjectReference _this r end +method UpdateIpRouteConfig + ManagedObjectReference _this r + HostIpRouteConfig config r +end + +method UpdateVirtualNic + ManagedObjectReference _this r + String device r + HostVirtualNicSpec nic r +end method WaitForUpdates returns UpdateSet r ManagedObjectReference _this:propertyCollector r diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 8a128df..f4e4a11 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -371,8 +371,12 @@ class Property(Member): % self.name elif self.occurrence in [OCCURRENCE__REQUIRED_LIST, OCCURRENCE__OPTIONAL_LIST]: - return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_LIST(%s, %s)\n" \ - % (self.type, self.name) + if self.type == "String": + return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_STRING_LIST(%s, %s)\n" \ + % (self.type, self.name) + else: + return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_LIST(%s, %s)\n" \ + % (self.type, self.name) elif self.type == "String": return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_VALUE(String, %s)\n" \ % self.name @@ -1519,8 +1523,31 @@ additional_object_features = { "AutoStartDefaults" : Object.FEATURE__AN Object.FEATURE__ANY_TYPE, "HostDatastoreBrowserSearchResults" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, + "HostIpConfig" : Object.FEATURE__DEEP_COPY, + "HostIpRouteConfig" : Object.FEATURE__ANY_TYPE, + "HostIpConfigIpV6Address" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, + "HostIpConfigIpV6AddressConfiguration" : Object.FEATURE__DEEP_COPY, + "HostPortGroup" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE, + "HostVirtualNic" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "HostVirtualSwitch" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "KeyValue" : Object.FEATURE__ANY_TYPE, "ManagedObjectReference" : Object.FEATURE__ANY_TYPE, + "PhysicalNic" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, "ObjectContent" : Object.FEATURE__DEEP_COPY, + "OptionValue" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "PhysicalNic" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, + "PhysicalNicSpec" : Object.FEATURE__DEEP_COPY, + "PhysicalNicLinkInfo" : Object.FEATURE__LIST, "ResourcePoolResourceUsage" : Object.FEATURE__ANY_TYPE, "ServiceContent" : Object.FEATURE__DESERIALIZE, "SharesInfo" : Object.FEATURE__ANY_TYPE, diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index bcc310f..f23af8d 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -475,7 +475,23 @@ continue; \ } - +#define ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_STRING_LIST(_type, _name) \ + if (xmlStrEqual(childNode->name, BAD_CAST #_name)) { \ + char *value = NULL; \ + \ + if (esxVI_String_DeserializeValue(childNode, &value) < 0 || \ + value == NULL) { \ + goto failure; \ + } \ + \ + if (esxVI_##_type##_AppendValueToList(&(*ptrptr)->_name, \ + value) < 0) { \ + VIR_FREE(value); \ + goto failure; \ + } \ + \ + continue; \ + } /* * A required property must be != 0 (NULL for pointers, "undefined" == 0 for -- 1.7.9.5

1 0

[libvirt] [PATCH v3 0/2] ESX: Add routines to interface driver
by Ata E Husain Bohra 20 Jul '12

20 Jul '12

Updated code to use ATTRIBUTE_UNUSED for un-used variable. Ata E Husain Bohra (2): ESX: Add routines to interface driver Use ATTRIBUTE_UNUSED for unused variable. src/esx/esx_interface_driver.c | 500 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi.c | 126 ++++++++++ src/esx/esx_vi.h | 10 + src/esx/esx_vi_generator.input | 227 ++++++++++++++++++ src/esx/esx_vi_generator.py | 31 ++- src/esx/esx_vi_types.c | 18 +- 6 files changed, 907 insertions(+), 5 deletions(-) -- 1.7.9.5

1 0

[libvirt] Intend to add OVA installation API
by Ata Bohra 19 Jul '12

19 Jul '12

Hi Everyone, I am relatively new to libvirt community; have worked on it from last half year mostly towards adding few missing APIs especially for ESX driver. One of the features I worked was installing a domain (VM) using OVAs. It is been a long time OVA became defacto standard for distributing and installing Virtual Machines, but surprisingly libvirt does not provide support for it. I wanted to perform a quick sanity int the community so that I am not stepping on anyone feet here. So far, I have working code, but to contribute upstream would require a bit of a cleanup work. One of the concern that I intend to get inputs on: OVA is a tar format archive, the first pre-requisite is to parse OVA and get following information: 1. XML descriptor. 2. VMDKs for transfer after domain is created on the hypervisor. (in ESX world that is done by getting a lease object and then transmitting the disk bits to hypervisor) I am wondering, where should I put the common code to parse OVA? My initial thought is to enhance conf/domain_conf.* file, given it already provides parsing routines for XML descriptor. Waiting for your feedback on this one. As I am familiar with ESX libvirt interaction, so the immediate plan is to enhance ESX driver, hopefully in near future will contribute the same feature to KVM/Xen etc. Thanks! Ata

4 6

[libvirt] Different mac address used in libvirtd
by Yong Sheng Gong 19 Jul '12

19 Jul '12

Hi, I found libvirtd will create vnet0 with a different mac other than the one defined in domain file. The mac in Domain file will be used by qemu-kvm. I want to know how libvirtd decides the mac for vnet0, Who can give me a hint about the location of the libvirtd codes which does this work? I cannot find how the libvirtd translates the mac from one defined in domain file to vnet0's one in src/util/bridge.c: brSetInterfaceMac() Thanks Yong Sheng Gong [root@robinlinux eclipsecdt]# virsh dumpxml 2 <domain type='kvm' id='2'> <name>instance-00000002</name> <uuid>03e9993b-eafa-4021-b929-4a51ce9635d5</uuid> <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc-0.14'>hvm</type> <kernel>/var/lib/nova/instances/instance-00000002/kernel</kernel> <initrd>/var/lib/nova/instances/instance-00000002/ramdisk</initrd> <cmdline>root=/dev/vda console=ttyS0</cmdline> <boot dev='hd'/> </os> <features> <acpi/> </features> <clock offset='utc'> <timer name='pit' tickpolicy='delay'/> <timer name='rtc' tickpolicy='catchup'/> </clock> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/qemu-kvm</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/nova/instances/instance-00000002/disk'/> <target dev='vda' bus='virtio'/> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> <interface type='bridge'> <mac address='fa:16:3e:28:64:c2'/> <source bridge='br100'/> <target dev='vnet0'/> <filterref filter='nova-instance-instance-00000002-fa163e2864c2'> <parameter name='DHCPSERVER' value='10.0.1.1'/> <parameter name='PROJNET' value='10.0.1.0'/> <parameter name='PROJMASK' value='255.255.255.0'/> <parameter name='IP' value='10.0.1.2'/> </filterref> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <serial type='file'> <source path='/var/lib/nova/instances/instance-00000002/console.log'/> <target port='0'/> <alias name='serial0'/> </serial> <serial type='pty'> <source path='/dev/pts/1'/> <target port='1'/> <alias name='serial1'/> </serial> <console type='file'> <source path='/var/lib/nova/instances/instance-00000002/console.log'/> <target type='serial' port='0'/> <alias name='serial0'/> </console> <input type='tablet' bus='usb'> <alias name='input0'/> </input> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5900' autoport='yes' listen='127.0.0.1' keymap='en-us'> <listen type='address' address='127.0.0.1'/> </graphics> <video> <model type='cirrus' vram='9216' heads='1'/> <alias name='video0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <alias name='balloon0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> </domain> [root@robinlinux eclipsecdt]# ifconfig vnet0 vnet0 Link encap:Ethernet HWaddr FE:16:3E:28:64:C2 inet6 addr: fe80::fc16:3eff:fe28:64c2/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:553 errors:0 dropped:0 overruns:0 frame:0 TX packets:1485 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:500 RX bytes:136360 (133.1 KiB) TX bytes:280590 (274.0 KiB)

3 2

[libvirt] [PATCH] Fix Xen driver to have sensible error messages
by Daniel P. Berrange 19 Jul '12

19 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The Xen driver had a number of error reports which passed a constant string without format specifiers and was missing "%s". Furthermore the errors were related to failing system calls, but virReportSystemError was not used. So the only useful piece of info (the errno) was being discarded --- cfg.mk | 2 +- src/xen/xen_hypervisor.c | 114 ++++++++++++++++++++++------------------------ 2 files changed, 55 insertions(+), 61 deletions(-) diff --git a/cfg.mk b/cfg.mk index 4225336..46331fd 100644 --- a/cfg.mk +++ b/cfg.mk @@ -540,6 +540,7 @@ msg_gen_function += virReportError msg_gen_function += virReportErrorHelper msg_gen_function += virReportSystemError msg_gen_function += virSecurityReportError +msg_gen_function += virXenError msg_gen_function += virXenInotifyError msg_gen_function += virXenStoreError msg_gen_function += virXendError @@ -552,7 +553,6 @@ msg_gen_function += xenXMError # so that they are translatable. # msg_gen_function += fprintf # msg_gen_function += testError -# msg_gen_function += virXenError # msg_gen_function += vshPrint # msg_gen_function += vshError diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index b4ec579..9747010 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -526,9 +526,15 @@ static int lock_pages(void *addr, size_t len) { #ifdef __linux__ - return mlock(addr, len); + if (mlock(addr, len) < 0) { + virReportSystemError(errno, + _("Unable to lock %zu bytes of memory"), + len); + return -1; + } + return 0; #elif defined(__sun) - return 0; + return 0; #endif } @@ -536,9 +542,15 @@ static int unlock_pages(void *addr, size_t len) { #ifdef __linux__ - return munlock(addr, len); + if (munlock(addr, len) < 0) { + virReportSystemError(errno, + _("Unable to unlock %zu bytes of memory"), + len); + return -1; + } + return 0; #elif defined(__sun) - return 0; + return 0; #endif } @@ -900,21 +912,18 @@ xenHypervisorDoV0Op(int handle, xen_op_v0 * op) hc.op = __HYPERVISOR_dom0_op; hc.arg[0] = (unsigned long) op; - if (lock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + if (lock_pages(op, sizeof(dom0_op_t)) < 0) return -1; - } ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc); if (ret < 0) { - virXenError(VIR_ERR_XEN_CALL, " ioctl %d", - xen_ioctl_hypercall_cmd); + virReportSystemError(errno, + _("Unable to issue hypervisor ioctl %d"), + xen_ioctl_hypercall_cmd); } - if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " releasing"); + if (unlock_pages(op, sizeof(dom0_op_t)) < 0) ret = -1; - } if (ret < 0) return -1; @@ -942,21 +951,18 @@ xenHypervisorDoV1Op(int handle, xen_op_v1* op) hc.op = __HYPERVISOR_dom0_op; hc.arg[0] = (unsigned long) op; - if (lock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + if (lock_pages(op, sizeof(dom0_op_t)) < 0) return -1; - } ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc); if (ret < 0) { - virXenError(VIR_ERR_XEN_CALL, " ioctl %d", - xen_ioctl_hypercall_cmd); + virReportSystemError(errno, + _("Unable to issue hypervisor ioctl %d"), + xen_ioctl_hypercall_cmd); } - if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " releasing"); + if (unlock_pages(op, sizeof(dom0_op_t)) < 0) ret = -1; - } if (ret < 0) return -1; @@ -985,21 +991,18 @@ xenHypervisorDoV2Sys(int handle, xen_op_v2_sys* op) hc.op = __HYPERVISOR_sysctl; hc.arg[0] = (unsigned long) op; - if (lock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + if (lock_pages(op, sizeof(dom0_op_t)) < 0) return -1; - } ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc); if (ret < 0) { - virXenError(VIR_ERR_XEN_CALL, " sys ioctl %d", - xen_ioctl_hypercall_cmd); + virReportSystemError(errno, + _("Unable to issue hypervisor ioctl %d"), + xen_ioctl_hypercall_cmd); } - if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " releasing"); + if (unlock_pages(op, sizeof(dom0_op_t)) < 0) ret = -1; - } if (ret < 0) return -1; @@ -1028,21 +1031,18 @@ xenHypervisorDoV2Dom(int handle, xen_op_v2_dom* op) hc.op = __HYPERVISOR_domctl; hc.arg[0] = (unsigned long) op; - if (lock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + if (lock_pages(op, sizeof(dom0_op_t)) < 0) return -1; - } ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc); if (ret < 0) { - virXenError(VIR_ERR_XEN_CALL, " ioctl %d", - xen_ioctl_hypercall_cmd); + virReportSystemError(errno, + _("Unable to issue hypervisor ioctl %d"), + xen_ioctl_hypercall_cmd); } - if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " releasing"); + if (unlock_pages(op, sizeof(dom0_op_t)) < 0) ret = -1; - } if (ret < 0) return -1; @@ -1068,10 +1068,9 @@ virXen_getdomaininfolist(int handle, int first_domain, int maxids, int ret = -1; if (lock_pages(XEN_GETDOMAININFOLIST_DATA(dominfos), - XEN_GETDOMAININFO_SIZE * maxids) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + XEN_GETDOMAININFO_SIZE * maxids) < 0) return -1; - } + if (hv_versions.hypervisor > 1) { xen_op_v2_sys op; @@ -1123,10 +1122,9 @@ virXen_getdomaininfolist(int handle, int first_domain, int maxids, ret = op.u.getdomaininfolist.num_domains; } if (unlock_pages(XEN_GETDOMAININFOLIST_DATA(dominfos), - XEN_GETDOMAININFO_SIZE * maxids) < 0) { - virXenError(VIR_ERR_XEN_CALL, " release"); + XEN_GETDOMAININFO_SIZE * maxids) < 0) ret = -1; - } + return ret; } @@ -1747,10 +1745,9 @@ virXen_setvcpumap(int handle, int id, unsigned int vcpu, if (hv_versions.hypervisor > 1) { xen_op_v2_dom op; - if (lock_pages(cpumap, maplen) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + if (lock_pages(cpumap, maplen) < 0) return -1; - } + memset(&op, 0, sizeof(op)); op.cmd = XEN_V2_OP_SETVCPUMAP; op.domain = (domid_t) id; @@ -1782,10 +1779,8 @@ virXen_setvcpumap(int handle, int id, unsigned int vcpu, ret = xenHypervisorDoV2Dom(handle, &op); VIR_FREE(new); - if (unlock_pages(cpumap, maplen) < 0) { - virXenError(VIR_ERR_XEN_CALL, " release"); + if (unlock_pages(cpumap, maplen) < 0) ret = -1; - } } else { cpumap_t xen_cpumap; /* limited to 64 CPUs in old hypervisors */ uint64_t *pm = &xen_cpumap; @@ -1879,10 +1874,9 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt, ipt->cpu = op.u.getvcpuinfod5.online ? (int)op.u.getvcpuinfod5.cpu : -1; } if ((cpumap != NULL) && (maplen > 0)) { - if (lock_pages(cpumap, maplen) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + if (lock_pages(cpumap, maplen) < 0) return -1; - } + memset(cpumap, 0, maplen); memset(&op, 0, sizeof(op)); op.cmd = XEN_V2_OP_GETVCPUMAP; @@ -1897,10 +1891,8 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt, op.u.getvcpumapd5.cpumap.nr_cpus = maplen * 8; } ret = xenHypervisorDoV2Dom(handle, &op); - if (unlock_pages(cpumap, maplen) < 0) { - virXenError(VIR_ERR_XEN_CALL, " release"); + if (unlock_pages(cpumap, maplen) < 0) ret = -1; - } } } else { int mapl = maplen; @@ -2079,8 +2071,9 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) */ hv_versions.hypervisor = -1; - virXenError(VIR_ERR_XEN_CALL, " ioctl %lu", - (unsigned long) IOCTL_PRIVCMD_HYPERCALL); + virReportSystemError(errno, + _("Unable to issue hypervisor ioctl %lu"), + (unsigned long)IOCTL_PRIVCMD_HYPERCALL); VIR_FORCE_CLOSE(fd); in_init = 0; return -1; @@ -2178,14 +2171,15 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) goto done; } + /* * we failed to make the getdomaininfolist hypercall */ - - VIR_DEBUG("Failed to find any Xen hypervisor method"); hv_versions.hypervisor = -1; - virXenError(VIR_ERR_XEN_CALL, " ioctl %lu", - (unsigned long)IOCTL_PRIVCMD_HYPERCALL); + virReportSystemError(errno, + _("Unable to issue hypervisor ioctl %lu"), + (unsigned long)IOCTL_PRIVCMD_HYPERCALL); + VIR_DEBUG("Failed to find any Xen hypervisor method"); VIR_FORCE_CLOSE(fd); in_init = 0; VIR_FREE(ipt); -- 1.7.10.4

2 1

[libvirt] [PATCH] qemu: Set reasonable RSS limit on domain startup
by Michal Privoznik 19 Jul '12

19 Jul '12

If there's a memory leak in qemu or qemu is exploited the host's system will sooner or later start trashing instead of killing the bad process. This however has impact on performance and other guests as well. Therefore we should set a reasonable RSS limit even when user hasn't set any. It's better to be secure by default. --- src/qemu/qemu_cgroup.c | 73 +++++++++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e39f5e1..2c158c1 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -339,42 +339,51 @@ int qemuSetupCgroup(struct qemud_driver *driver, } } - if (vm->def->mem.hard_limit != 0 || - vm->def->mem.soft_limit != 0 || - vm->def->mem.swap_hard_limit != 0) { - if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY)) { - if (vm->def->mem.hard_limit != 0) { - rc = virCgroupSetMemoryHardLimit(cgroup, vm->def->mem.hard_limit); - if (rc != 0) { - virReportSystemError(-rc, - _("Unable to set memory hard limit for domain %s"), - vm->def->name); - goto cleanup; - } - } - if (vm->def->mem.soft_limit != 0) { - rc = virCgroupSetMemorySoftLimit(cgroup, vm->def->mem.soft_limit); - if (rc != 0) { - virReportSystemError(-rc, - _("Unable to set memory soft limit for domain %s"), - vm->def->name); - goto cleanup; - } + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY)) { + unsigned long long hard_limit = vm->def->mem.hard_limit; + + if (!hard_limit) { + /* If there is no hard_limit set, set a reasonable + * one to avoid system trashing caused by exploited qemu. + * As 'reasonable limit' has been chosen: + * (1 + k) * (domain memory) + F + * where k = 0.02 and F = 200MB. */ + hard_limit = vm->def->mem.max_balloon * 1.02 + 204800; + } + + rc = virCgroupSetMemoryHardLimit(cgroup, hard_limit); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set memory hard limit for domain %s"), + vm->def->name); + goto cleanup; + } + if (vm->def->mem.soft_limit != 0) { + rc = virCgroupSetMemorySoftLimit(cgroup, vm->def->mem.soft_limit); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set memory soft limit for domain %s"), + vm->def->name); + goto cleanup; } + } - if (vm->def->mem.swap_hard_limit != 0) { - rc = virCgroupSetMemSwapHardLimit(cgroup, vm->def->mem.swap_hard_limit); - if (rc != 0) { - virReportSystemError(-rc, - _("Unable to set swap hard limit for domain %s"), - vm->def->name); - goto cleanup; - } + if (vm->def->mem.swap_hard_limit != 0) { + rc = virCgroupSetMemSwapHardLimit(cgroup, vm->def->mem.swap_hard_limit); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set swap hard limit for domain %s"), + vm->def->name); + goto cleanup; } - } else { - qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Memory cgroup is not available on this host")); } + } else if (vm->def->mem.hard_limit != 0 || + vm->def->mem.soft_limit != 0 || + vm->def->mem.swap_hard_limit != 0) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Memory cgroup is not available on this host")); + } else { + VIR_WARN("Could not autoset a RSS limit for domain %s", vm->def->name); } if (vm->def->cputune.shares != 0) { -- 1.7.8.6

6 5

[libvirt] libvirt qemu cgroup problem
by faicker mo 19 Jul '12

19 Jul '12

I want to use the cgroup with libvirt+qemu. The VM runs well. But the libvirt report error, here is the libvirt debug info: 2012-07-19 09:40:10.726+0000: 32341: debug : virCgroupNew:603 : New group / 2012-07-19 09:40:10.726+0000: 32341: info : qemudStartup:597 : Unable to create cgroup for driver: No such device or address 2012-07-19 09:40:10.726+0000: 32341: debug : virLockManagerNopInit:35 : version=1000000 configFile=(null) flags=0 2012-07-19 09:40:10.726+0000: 32341: info : qemudLoadDriverConfig:332 : Configured cgroup controller 'cpu' 2012-07-19 09:40:10.726+0000: 32341: info : qemudLoadDriverConfig:332 : Configured cgroup controller 'cpuacct' 2012-07-19 09:40:10.726+0000: 32341: info : qemudLoadDriverConfig:332 : Configured cgroup controller 'cpuset' 2012-07-19 09:40:10.726+0000: 32341: info : qemudLoadDriverConfig:332 : Configured cgroup controller 'memory' 2012-07-19 09:40:10.726+0000: 32341: info : qemudLoadDriverConfig:332 : Configured cgroup controller 'devices' 2012-07-19 09:40:10.726+0000: 32341: info : qemudLoadDriverConfig:332 : Configured cgroup controller 'blkio' I can't find the /sys/fs/cgroup dir or any other dir? virsh blkiotune test error: Unable to get blkio parameters error: Requested operation is not valid: blkio cgroup isn't mounted ------ thank you.

1 0

[libvirt] [PATCH v2] Per-guest configurable user/group for QEMU processes
by Marcelo Cerri 19 Jul '12

19 Jul '12

This is a v2 patch series that updates the libvirt's security driver mechanism to support per-guest configurable user and group for QEMU processes running together with other security drivers, such as SELinux and AppArmor. Comments and feedbacks are welcome.

4 14

[libvirt] Unable to startVM in Power PC
by B Veera-B37207 19 Jul '12

19 Jul '12

Hi, Here is my xml file <domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> <name>Test</name> <uuid>aaec5748-56a9-e2fe-655c-c08ca3a4c097</uuid> <memory unit='KiB'>65536</memory> <currentMemory unit='KiB'>65536</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='ppce500v2'>hvm</type> <kernel>/boot/uImage-p2020rdb.bin</kernel> <initrd>/home/root/guest.rootfs.ext2.gz</initrd> <cmdline>root=/dev/ram rw console=ttyS0,115200</cmdline> </os> <features> <acpi/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc</emulator> <interface type='ethernet'> <mac address='52:54:00:dd:fa:40'/> <script path='/home/root/qemu-ifup'/> <model type='virtio'/> </interface> <serial type='tcp'> <source mode='bind' host='' service='4444'/> <protocol type='raw'/> <target port='0'/> </serial> <console type='tcp'> <source mode='bind' host='' service='4444'/> <protocol type='raw'/> <target type='serial' port='0'/> </console> <memballoon model='virtio'/> </devices> <qemu:commandline> <qemu:arg value='200M'/> <qemu:arg value='-mem-path'/> <qemu:arg value='/var/lib/hugetlbfs/pagesize-4MB'/> <qemu:arg value='-dtb'/> <qemu:arg value='/usr/share/qemu/ppce500v2.dtb'/> </qemu:commandline> </domain> While starting VM I am getting following error root@p2020rdb:~# virsh start Test error: Failed to start domain Test error: Unable to read from monitor: Connection reset by peer ############################# Test.log Log file ############ ################ LC_ALL=C PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin HOME=/home/root USER=root LOGNAME=root /usr/bin/qemu-system-ppc -name Test -S -M ppce500v2 -m 256 -smp 1,sockets=1,cores=1,threads=1 -uuid aaec5748-56a9-e2fe-655c-c08ca3a4c097 -nographic -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/usr/local/var/lib/libvirt/qemu/Test.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-shutdown -kernel /boot/uImage-p2020rdb.bin -initrd /home/root/guest.rootfs.ext2.gz -append root=/dev/ram rw console=ttyS0,115200 -device piix3-usb-uhci,id=usb,bus=pci,addr=0x1.0x2 -netdev tap,script=/home/root/qemu-ifup,id=hostnet0 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:dd:fa:40,bus=pci,addr=0x3 -chardev socket,id=charserial0,host=,port=4444,server,nowait -device isa-serial,chardev=charserial0,id=serial0 -device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x4 -mem-path /var/lib/hugetlbfs/pagesize-4MB -dtb /usr/share/qemu/ppce500v2.dtb Domain id=24 is tainted: high-privileges Domain id=24 is tainted: custom-argv Domain id=24 is tainted: shell-scripts qemu-system-ppc: -device piix3-usb-uhci,id=usb,bus=pci,addr=0x1.0x2: Bus 'pci' not found 2012-07-19 09:06:25.215+0000: shutting down Please help me regarding this issue Regards, Veera.

1 0

[libvirt] [PATCH 00/16] Misc fixes and refactoring of LXC driver
by Daniel P. Berrange 19 Jul '12

19 Jul '12

The first 7 patches in this series are a set of misc fixes I identified while working on the LXC driver code. The remaining 9 patches heavily re-arrange, re-factor and re-name the LXC driver code. The intent is to make the code layout closer in style to the QEMU driver, to facilitate its future growth in size & complexity

3 33

[libvirt] [PATCH libvirt-glib] gobject: add GVir.DomainXMLFlags binding
by Marc-André Lureau 19 Jul '12

19 Jul '12

--- libvirt-gobject/libvirt-gobject-domain.c | 2 +- libvirt-gobject/libvirt-gobject-domain.h | 14 ++++++++++++++ libvirt-gobject/libvirt-gobject.sym | 5 +++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index e14190c..ba8e12b 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -709,7 +709,7 @@ gboolean gvir_domain_save_to_file_finish(GVirDomain *dom, /** * gvir_domain_get_config: * @dom: the domain - * @flags: the flags + * @flags: the %GVirDomainXMLFlags flags * * Returns: (transfer full): the config. The returned object should be * unreffed with g_object_unref() when no longer needed. diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 8f17799..70e7e37 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -102,6 +102,20 @@ typedef enum { GVIR_DOMAIN_DELETE_SNAPSHOTS_METADATA = VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA, } GVirDomainDeleteFlags; +/** + * GVirDomainXMLFlags: + * @GVIR_DOMAIN_XML_NONE: No flags + * @GVIR_DOMAIN_XML_SECURE: Dump security sensitive information too + * @GVIR_DOMAIN_XML_INACTIVE: Dump inactive domain information + * @GVIR_DOMAIN_XML_UPDATE_CPU: Update guest CPU requirements according to host CPU + */ +typedef enum { + GVIR_DOMAIN_XML_NONE = 0, + GVIR_DOMAIN_XML_SECURE = VIR_DOMAIN_XML_SECURE, + GVIR_DOMAIN_XML_INACTIVE = VIR_DOMAIN_XML_INACTIVE, + GVIR_DOMAIN_XML_UPDATE_CPU = VIR_DOMAIN_XML_UPDATE_CPU, +} GVirDomainXMLFlags; + typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo { diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 60478d1..cc602d3 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -175,4 +175,9 @@ LIBVIRT_GOBJECT_0.0.9 { gvir_domain_start_finish; } LIBVIRT_GOBJECT_0.0.8; +LIBVIRT_GOBJECT_0.1.1 { + global: + gvir_domain_xml_flags_get_type; +} LIBVIRT_GOBJECT_0.0.9; + # .... define new API here using predicted next version number .... -- 1.7.10.4

2 1

[libvirt] Libvirt on power pc
by B Veera-B37207 19 Jul '12

19 Jul '12

Hi, Using command line I am able to bring up VM Here is the command: "qemu-system-ppc -enable-kvm -m 512M -mem-path /var/lib/hugetlbfs/pagesize-4MB -nographic -M ppce500v2 -kernel /boot/uImage-p2020rdb.bin -initrd ./guest.rootfs.ext2.gz -append "root=/dev/ram rw console=ttyS0,115200" -serial tcp::4444,server,telnet -dtb /usr/share/qemu/ppce500v2.dtb -net nic,model=virtio -net tap,script=/home/root/qemu-ifup" Can anybody let me know the libvirt xml format for above command. Regards, Veera.

2 1

[libvirt] [PATCH] rpc: remove trailing carriage return character in error string
by Guannan Ren 19 Jul '12

19 Jul '12

If the error message string ends with '\r\n', it is not enough to remove '\n' only which leads to messed string. Example, after three time incorrect password input, virsh command virsh -c qemu://remoteserver/system will report error like: : Connection reset by peerey,gssapi-keyex,gssapi-with-mic,password). it should be: Permission denied (publickey,gssapi-keyex,gssapi-with-mic,password). : Connection reset by peer The terminal interprets '\r' as "move the cursor back to the start of the current line", so we have to remove the character if it exists. --- src/rpc/virnetsocket.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 08dfbb0..8385d88 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -985,8 +985,14 @@ reread: virFileReadLimFD(sock->errfd, 1024, &errout) >= 0 && errout != NULL) { size_t elen = strlen(errout); - if (elen && errout[elen-1] == '\n') + if (elen && errout[elen-1] == '\n') { errout[elen-1] = '\0'; + + /* remove trailing '\r' if it exists */ + if (elen-1 && errout[elen-2] == '\r') { + errout[elen-2] = '\0'; + } + } } if (ret < 0) { -- 1.7.7.5

2 4