- Devel - libvirt List Archives

[libvirt] [PATCH] ESX: Add "Byte" datatype
by Ata E Husain Bohra 01 Aug '12

01 Aug '12

Append "Byte" datatype to esx_vi_types predefined datatype set. Ata E Husain Bohra (1): ESX: Add "Byte" datatype src/esx/esx_vi_generator.py | 1 + src/esx/esx_vi_types.c | 57 +++++++++++++++++++++++++++++++++++++++++++ src/esx/esx_vi_types.h | 28 +++++++++++++++++++++ 3 files changed, 86 insertions(+) -- 1.7.9.5

1 0

[libvirt] [PATCH v2 0/5] Introduce API for dumping domain IP addresses
by Michal Privoznik 01 Aug '12

01 Aug '12

This feature has been requested for a very long time. However, we had to wait for guest agent to obtain reliable results as user might create totally different structure of interfaces than seen from outside (e.g. bonding, virtual interfaces, etc.). That's the main reason why sniffing for domain traffic can return bogus results. Fortunately, qemu guest agent implement requested part for a while so nothing holds us back anymore. To make matters worse, guest OS can assign whatever name to an interface and changing MAC inside guest isn't propagated to the host which in the end see original one. Therefore, finding correlation between interface within guest and the host side end is left as exercise for mgmt applications. This API is called virDomainGetInterfacesAddresses (okay, maybe too many plurals) and returns a XML document containing all interesting data. diff to v1: -switch from struct to XML doc Michal Privoznik (5): Introduce virDomainGetInterfacesAddresses API virsh: Expose virDomainGetInterfacesAddresses qemu_agent: Implement 'guest-network-get-interfaces' command handling qemu: Implement virDomainInterfacesAddresses python: create example for dumping domain IP addresses docs/schemas/interfaces.rng | 57 +++++++++++++++++ examples/python/Makefile.am | 2 +- examples/python/README | 1 + examples/python/domipaddrs.py | 62 +++++++++++++++++++ include/libvirt/libvirt.h.in | 2 + src/driver.h | 4 + src/libvirt.c | 49 +++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_agent.c | 135 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 2 + src/qemu/qemu_driver.c | 68 +++++++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 12 +++- src/remote_protocol-structs | 8 +++ tools/virsh.c | 41 ++++++++++++ tools/virsh.pod | 9 +++ 16 files changed, 452 insertions(+), 2 deletions(-) create mode 100644 docs/schemas/interfaces.rng create mode 100644 examples/python/domipaddrs.py -- 1.7.8.5

4 14

[libvirt] [Patch v2 0/3] Add QEMU network helper support
by rmarwah＠linux.vnet.ibm.com 31 Jul '12

31 Jul '12

From: Richa Marwaha <rmarwah(a)linux.vnet.ibm.com> QEMU has a new feature which allows QEMU to execute under an unprivileged user ID and still be able to add a tap device to a Linux network bridge. Below is the link to the QEMU patches for the bridge helper feature: http://lists.gnu.org/archive/html/qemu-devel/2012-01/msg03562.html The existing libvirt tap network device support for adding a tap device to a bridge (-netdev tap) works only when connected to a libvirtd instance running as the privileged system account 'root'. When connected to a libvirtd instance running as an unprivileged user (ie. using the session URI) creation of the tap device fails as follows: error: Failed to start domain F14_64 error: Unable to create tap device vnet%d: Operation not permitted With this support, creating a tap device in the above scenario will be possible. Additionally, hot attaching a tap device to a bridge while running when connected to a libvirtd instance running as an unprivileged user will be possible. Richa Marwaha (3): Add -netdev bridge capabilities Add -netdev bridge support apparmor: QEMU bridge helper policy updates examples/apparmor/libvirt-qemu | 21 +++++++++++++- src/qemu/qemu_capabilities.c | 13 ++++++-- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 61 ++++++++++++++++++++++++++++----------- src/qemu/qemu_command.h | 2 + src/qemu/qemu_hotplug.c | 31 ++++++++++++++------ 6 files changed, 97 insertions(+), 32 deletions(-)

7 20

[libvirt] [PATCH] qemu: fix use after free
by Eric Blake 31 Jul '12

31 Jul '12

Detected by Coverity. * src/qemu/qemu_hotplug.c (qemuDomainAttachHostDevice): Avoid double free of usb on failure. --- src/qemu/qemu_hotplug.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ba841e9..ceffe22 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1170,6 +1170,7 @@ int qemuDomainAttachHostDevice(struct qemud_driver *driver, if (usbDeviceListAdd(list, usb) < 0) { usbFreeDevice(usb); + usb = NULL: goto cleanup; } -- 1.7.11.2

3 2

[libvirt] [QEMU PATCH 0/3] versioned CPU models / per-machine-type aliases
by Eduardo Habkost 31 Jul '12

31 Jul '12

Hi, This is the first try at a simple system to make the CPU model definitions versioned (to allow them to get bug fixes while allowing migration from older versions and keeping command-line compatibility), and per- machine-type aliases for compatibility. The lack of CPU model versioning is blocking multiple bug fixes that are necessary on CPU model definitions, but can't be included today because they would break migration. Later, after this gets in (or at least gets some feedback), I plan to send a proposal for a machine-friendly CPU feature / CPU model probing interface that libvirt could use. Eduardo Habkost (3): vl.c: extract qemu_machine_init() function per-machine-type CPU model alias system x86: pc: versioned CPU model names & compatibility aliases hw/boards.h | 13 +++++++++ hw/pc_piix.c | 56 ++++++++++++++++++++++++++++++++++++ sysconfigs/target/cpus-x86_64.conf | 18 ++++++------ vl.c | 28 +++++++++++++++++- 4 files changed, 105 insertions(+), 10 deletions(-) -- 1.7.10.4

6 18

[libvirt] [PATCH][TCK] Add listen type for graphic
by Kyla Zhang 31 Jul '12

31 Jul '12

For default domain build there is no graphic listen type so it will report error. This patch will fix it with adding default type with "address" --- lib/Sys/Virt/TCK/DomainBuilder.pm | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/Sys/Virt/TCK/DomainBuilder.pm b/lib/Sys/Virt/TCK/DomainBuilder.pm index dfd988e..dbfb65f 100644 --- a/lib/Sys/Virt/TCK/DomainBuilder.pm +++ b/lib/Sys/Virt/TCK/DomainBuilder.pm @@ -460,7 +460,8 @@ sub as_xml { $w->emptyTag("autoport", autoport => $graphic->{autoport}); $w->emptyTag("listen", - listen => $graphic->{listen}); + listen => $graphic->{listen}, + $graphic->{listen_type} ? (type => $graphic->{listen_type}) : type => "address"); $w->emptyTag("keymap", keymap => $graphic->{keymap}); $w->endTag("graphics"); -- 1.7.1

3 2

[libvirt] Question about pci-passthrough
by Shradha Shah 31 Jul '12

31 Jul '12

Hello All, I had a question about pci-passthrough using hostdev mode in Libvirt. When I assign hostdev->parent.type = VIR_DOMAIN_DEVICE_NET, the hostdev is passed into the guest and acts as a network device. When I assign hostdev->parent.type = VIR_DOMAIN_DEVICE_NONE, the hostdev is passed into the guest and acts as a PCI Host device. Please can someone point me to the part of code in libvirt where this decision is made based on hostdev->parent.type? -- Many Thanks, Regards, Shradha Shah

2 2

[libvirt] [PATCH v2 1/3] conf: Format numatune XML correctly while placement is none
by Osier Yang 31 Jul '12

31 Jul '12

setNumaParameters tunes the numa setting using cgroup, it's another entry except libnuma/numad for numa tuning. And it doesn't set the placement, and further more, the formating codes doesn't take this into consideration. How to reproduce: conn = libvirt.open(None) dom = conn.lookupByName('linux') param = {'numa_nodeset': '0', 'numa_mode': 1} dom.setNumaParameters(param, 2) % virsh start linux error: Failed to start domain rhel6.3rc error: (domain_definition):8: error parsing attribute name <memory mode='preferred' </numatune> -------------------------------^ --- src/conf/domain_conf.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 81c6308..c44d89d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12795,23 +12795,26 @@ virDomainDefFormatInternal(virDomainDefPtr def, const char *placement; mode = virDomainNumatuneMemModeTypeToString(def->numatune.memory.mode); - virBufferAsprintf(buf, " <memory mode='%s' ", mode); + virBufferAsprintf(buf, " <memory mode='%s'", mode); - if (def->numatune.memory.placement_mode == - VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_STATIC) { + if (def->numatune.memory.nodemask) { nodemask = virDomainCpuSetFormat(def->numatune.memory.nodemask, - VIR_DOMAIN_CPUMASK_LEN); + VIR_DOMAIN_CPUMASK_LEN); if (nodemask == NULL) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to format nodeset for " "NUMA memory tuning")); goto cleanup; } - virBufferAsprintf(buf, "nodeset='%s'/>\n", nodemask); + virBufferAsprintf(buf, " nodeset='%s'/>\n", nodemask); VIR_FREE(nodemask); - } else if (def->numatune.memory.placement_mode) { + } else if (def->numatune.memory.placement_mode == + VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_AUTO) { placement = virDomainNumatuneMemPlacementModeTypeToString(def->numatune.memory.placement_mode); - virBufferAsprintf(buf, "placement='%s'/>\n", placement); + virBufferAsprintf(buf, " placement='%s'/>\n", placement); + } else { + /* Should not hit here. */ + virBufferAddLit(buf, "/>\n"); } virBufferAddLit(buf, " </numatune>\n"); } -- 1.7.7.3

3 7

[libvirt] [PATCH] build: distribute virsh related source files
by Guannan Ren 31 Jul '12

31 Jul '12

In virsh.c, it includes multiple virsh source files, we need to have them distributed. --- tools/Makefile.am | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 723db8e..7c048b2 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -25,8 +25,17 @@ EXTRA_DIST = \ virt-sanlock-cleanup.in \ virt-sanlock-cleanup.8 \ virsh.pod \ - libvirt-guests.sysconf \ - virsh-edit.c + libvirt-guests.sysconf \ + virsh-edit.c \ + virsh-domain.c \ + virsh-domain-monitor.c \ + virsh-host.c virsh-interface.c \ + virsh-network.c virsh-nodedev.c \ + virsh-nwfilter.c virsh-pool.c \ + virsh-secret.c virsh-snapshot.c \ + virsh-volume.c + + DISTCLEANFILES = -- 1.7.7.6

3 3

[libvirt] [PATCH] build: fix build without HAVE_CAPNG
by Eric Blake 30 Jul '12

30 Jul '12

Otherwise, a build may fail with: lxc/lxc_conatiner.c: In function 'lxcContainerDropCapabilities': lxc/lxc_container.c:1662:46: error: unused parameter 'keepReboot' [-Werror=unused-parameter] * src/lxc/lxc_container.c (lxcContainerDropCapabilities): Mark parameter unused. --- Pushing under the build-breaker rule. src/lxc/lxc_container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 6043b00..f3a4622 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1659,7 +1659,7 @@ static int lxcContainerSetupMounts(virDomainDefPtr vmDef, * It removes some capabilities that could be dangerous to * host system, since they are not currently "containerized" */ -static int lxcContainerDropCapabilities(bool keepReboot) +static int lxcContainerDropCapabilities(bool keepReboot ATTRIBUTE_UNUSED) { #if HAVE_CAPNG int ret; -- 1.7.11.2

1 0

[libvirt] [PATCH] Bind connection close callback APIs to python binding
by Daniel P. Berrange 30 Jul '12

30 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Add code in the python binding to cope with the new APIs virConnectRegisterCloseCallback and virConnectDeregisterCloseCallback. Also demonstrate their use in the python domain events demo --- examples/domain-events/events-python/event-test.py | 14 ++- python/generator.py | 5 +- python/libvirt-override-virConnect.py | 24 +++++ python/libvirt-override.c | 107 ++++++++++++++++++++ 4 files changed, 147 insertions(+), 3 deletions(-) diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 736c225..8193d18 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -490,6 +490,16 @@ def myDomainEventPMSuspendCallback(conn, dom, reason, opaque): dom.name(), dom.ID()) def myDomainEventBalloonChangeCallback(conn, dom, utcoffset, actual): print "myDomainEventBalloonChangeCallback: Domain %s(%s) %d" % (dom.name(), dom.ID(), actual) + +run = True + +def myConnectionCloseCallback(conn, reason, opaque): + reasonStrings = ( + "Error", "End-of-file", "Keepalive", "Client", + ) + print "myConnectionCloseCallback: %s: %s" % (conn.getURI(), reasonStrings[reason]) + run = False + def usage(out=sys.stderr): print >>out, "usage: "+os.path.basename(sys.argv[0])+" [-hdl] [uri]" print >>out, " uri will default to qemu:///system" @@ -539,6 +549,8 @@ def main(): if (old_exitfunc): old_exitfunc() sys.exitfunc = exit + vc.registerCloseCallback(myConnectionCloseCallback, None) + #Add 2 callbacks to prove this works with more than just one vc.domainEventRegister(myDomainEventCallback1,None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_LIFECYCLE, myDomainEventCallback2, None) @@ -559,7 +571,7 @@ def main(): # of demo we'll just go to sleep. The other option is to # run the event loop in your main thread if your app is # totally event based. - while vc.isAlive() == 1: + while run: time.sleep(1) diff --git a/python/generator.py b/python/generator.py index 6559ece..6ccbf56 100755 --- a/python/generator.py +++ b/python/generator.py @@ -425,8 +425,6 @@ skip_impl = ( 'virDomainGetInterfaceParameters', 'virDomainGetCPUStats', 'virDomainGetDiskErrors', - 'virConnectUnregisterCloseCallback', - 'virConnectRegisterCloseCallback', ) qemu_skip_impl = ( @@ -464,6 +462,9 @@ skip_function = ( 'virStreamRecv', # overridden in libvirt-override-virStream.py 'virStreamSend', # overridden in libvirt-override-virStream.py + 'virConnectDeregisterCloseCallback', # overriden in virConnect.py + 'virConnectRegisterCloseCallback', # overriden in virConnect.py + # 'Ref' functions have no use for bindings users. "virConnectRef", "virDomainRef", diff --git a/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py index 50177ab..de8167e 100644 --- a/python/libvirt-override-virConnect.py +++ b/python/libvirt-override-virConnect.py @@ -206,3 +206,27 @@ retlist.append(virDomain(self, _obj=domptr)) return retlist + + def _dispatchCloseCallback(self, reason, cbData): + """Dispatches events to python user close callback""" + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, reason, opaque) + return 0 + + + def deregisterCloseCallback(self): + """Removes a close event callback""" + ret = libvirtmod.virConnectDeregisterCloseCallback(self._o) + if ret == -1: raise libvirtError ('virConnectDeregisterCloseCallback() failed', conn=self) + + def registerCloseCallback(self, cb, opaque): + """Adds a close event callback, providing a notification + when a connection fails / closes""" + cbData = { "cb": cb, "conn": self, "opaque": opaque } + ret = libvirtmod.virConnectRegisterCloseCallback(self._o, cbData) + if ret == -1: + raise libvirtError ('virConnectRegisterCloseCallback() failed', conn=self) + return ret + diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 8b41dff..b7269fc 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -5521,6 +5521,111 @@ libvirt_virConnectDomainEventDeregisterAny(ATTRIBUTE_UNUSED PyObject * self, return py_retval; } + +static void +libvirt_virConnectCloseCallbackDispatch(virConnectPtr conn ATTRIBUTE_UNUSED, + int reason, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_ret; + PyObject *pyobj_conn; + PyObject *dictKey; + + LIBVIRT_ENSURE_THREAD_STATE; + + Py_INCREF(pyobj_cbData); + + dictKey = libvirt_constcharPtrWrap("conn"); + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchCloseCallback", + (char*)"iO", + reason, + pyobj_cbData); + + Py_DECREF(pyobj_cbData); + + if(!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + } + + LIBVIRT_RELEASE_THREAD_STATE; +} + +static PyObject * +libvirt_virConnectRegisterCloseCallback(ATTRIBUTE_UNUSED PyObject * self, + PyObject * args) +{ + PyObject *py_retval; /* return value */ + PyObject *pyobj_conn; /* virConnectPtr */ + PyObject *pyobj_cbData; /* hash of callback data */ + virConnectPtr conn; + int ret = 0; + + if (!PyArg_ParseTuple + (args, (char *) "OO:virConnectRegisterCloseCallback", + &pyobj_conn, &pyobj_cbData)) { + DEBUG("%s failed parsing tuple\n", __FUNCTION__); + return VIR_PY_INT_FAIL; + } + + DEBUG("libvirt_virConnectRegisterCloseCallback(%p %p) called\n", + pyobj_conn, pyobj_cbData); + conn = PyvirConnect_Get(pyobj_conn); + + Py_INCREF(pyobj_cbData); + + LIBVIRT_BEGIN_ALLOW_THREADS; + ret = virConnectRegisterCloseCallback(conn, + libvirt_virConnectCloseCallbackDispatch, + pyobj_cbData, + libvirt_virConnectDomainEventFreeFunc); + LIBVIRT_END_ALLOW_THREADS; + + if (ret < 0) { + Py_DECREF(pyobj_cbData); + } + + py_retval = libvirt_intWrap(ret); + return py_retval; +} + +static PyObject * +libvirt_virConnectDeregisterCloseCallback(ATTRIBUTE_UNUSED PyObject * self, + PyObject * args) +{ + PyObject *py_retval; + PyObject *pyobj_conn; + virConnectPtr conn; + int ret = 0; + + if (!PyArg_ParseTuple + (args, (char *) "O:virConnectDomainEventDeregister", + &pyobj_conn)) + return NULL; + + DEBUG("libvirt_virConnectDomainEventDeregister(%p) called\n", + pyobj_conn); + + conn = PyvirConnect_Get(pyobj_conn); + + LIBVIRT_BEGIN_ALLOW_THREADS; + + ret = virConnectDeregisterCloseCallback(conn, + libvirt_virConnectCloseCallbackDispatch); + + LIBVIRT_END_ALLOW_THREADS; + py_retval = libvirt_intWrap(ret); + return py_retval; +} + static void libvirt_virStreamEventFreeFunc(void *opaque) { @@ -5822,10 +5927,12 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnectListDomainsID", libvirt_virConnectListDomainsID, METH_VARARGS, NULL}, {(char *) "virConnectListDefinedDomains", libvirt_virConnectListDefinedDomains, METH_VARARGS, NULL}, {(char *) "virConnectListAllDomains", libvirt_virConnectListAllDomains, METH_VARARGS, NULL}, + {(char *) "virConnectDeregisterCloseCallback", libvirt_virConnectDeregisterCloseCallback, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventRegister", libvirt_virConnectDomainEventRegister, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventDeregister", libvirt_virConnectDomainEventDeregister, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventRegisterAny", libvirt_virConnectDomainEventRegisterAny, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventDeregisterAny", libvirt_virConnectDomainEventDeregisterAny, METH_VARARGS, NULL}, + {(char *) "virConnectRegisterCloseCallback", libvirt_virConnectRegisterCloseCallback, METH_VARARGS, NULL}, {(char *) "virStreamEventAddCallback", libvirt_virStreamEventAddCallback, METH_VARARGS, NULL}, {(char *) "virStreamRecv", libvirt_virStreamRecv, METH_VARARGS, NULL}, {(char *) "virStreamSend", libvirt_virStreamSend, METH_VARARGS, NULL}, -- 1.7.10.4

2 1

[libvirt] [PATCH] s/Un/De in virConnectUnregisterCloseCallback
by Daniel P. Berrange 30 Jul '12

30 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Previous APIs have used the word 'Deregister' rather than 'Unregister', so rename the recently added API to match. --- include/libvirt/libvirt.h.in | 2 +- src/libvirt.c | 8 ++++---- src/libvirt_public.syms | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index d21d029..7fed091 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1197,7 +1197,7 @@ int virConnectRegisterCloseCallback(virConnectPtr conn, virConnectCloseFunc cb, void *opaque, virFreeCallback freecb); -int virConnectUnregisterCloseCallback(virConnectPtr conn, +int virConnectDeregisterCloseCallback(virConnectPtr conn, virConnectCloseFunc cb); /* diff --git a/src/libvirt.c b/src/libvirt.c index 8e789be..a97976c 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -13945,7 +13945,7 @@ error: * funtion. * * Use of this method is no longer recommended. Instead applications - * should try virConnectDomainEventUnregisterAny which has a more flexible + * should try virConnectDomainEventDeregisterAny which has a more flexible * API contract * * Returns 0 on success, -1 on failure @@ -16541,7 +16541,7 @@ error: * * The return value from this method is a positive integer identifier * for the callback. To unregister a callback, this callback ID should - * be passed to the virDomainEventUnregisterAny method + * be passed to the virDomainEventDeregisterAny method * * Returns a callback identifier on success, -1 on failure */ @@ -18687,7 +18687,7 @@ error: } /** - * virConnectUnregisterCloseCallback: + * virConnectDeregisterCloseCallback: * @conn: pointer to connection object * @cb: pointer to the current registered callback * @@ -18699,7 +18699,7 @@ error: * * Returns 0 on success, -1 on error */ -int virConnectUnregisterCloseCallback(virConnectPtr conn, +int virConnectDeregisterCloseCallback(virConnectPtr conn, virConnectCloseFunc cb) { VIR_DEBUG("conn=%p", conn); diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 5004182..d465a57 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -548,7 +548,7 @@ LIBVIRT_0.9.14 { global: virDomainGetHostname; virConnectRegisterCloseCallback; - virConnectUnregisterCloseCallback; + virConnectDeregisterCloseCallback; } LIBVIRT_0.9.13; # .... define new API here using predicted next version number .... -- 1.7.10.4

2 1

[libvirt] [PATCH] Add support for disabling S3 and S4 states
by Martin Kletzander 30 Jul '12

30 Jul '12

There a two new elements in <features> implemented, which control what ACPI sleeping states will be advertised. The default is to have both states enabled, so this means no change for current machines. --- docs/schemas/domaincommon.rng | 10 ++++++ src/conf/domain_conf.c | 4 ++- src/conf/domain_conf.h | 2 + src/qemu/qemu_command.c | 17 +++++++++++ src/qemu/qemu_driver.c | 15 ++++++++++ tests/qemuargv2xmltest.c | 3 ++ .../qemuxml2argv-misc-disable-s3.args | 4 ++ .../qemuxml2argv-misc-disable-s3.xml | 29 +++++++++++++++++++ .../qemuxml2argv-misc-disable-s4.args | 4 ++ .../qemuxml2argv-misc-disable-s4.xml | 29 +++++++++++++++++++ .../qemuxml2argv-misc-disable-suspends.args | 4 ++ .../qemuxml2argv-misc-disable-suspends.xml | 30 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ tests/qemuxml2xmltest.c | 3 ++ 14 files changed, 156 insertions(+), 1 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s4.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s4.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index b7562ad..859cb26 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2788,6 +2788,16 @@ <empty/> </element> </optional> + <optional> + <element name="disable_s3"> + <empty/> + </element> + </optional> + <optional> + <element name="disable_s4"> + <empty/> + </element> + </optional> </interleave> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 143d92e..1bfb8d0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -107,7 +107,9 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST, "pae", "hap", "viridian", - "privnet") + "privnet", + "disable_s3", + "disable_s4") VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, "destroy", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bc02caf..b7ee95e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1346,6 +1346,8 @@ enum virDomainFeature { VIR_DOMAIN_FEATURE_HAP, VIR_DOMAIN_FEATURE_VIRIDIAN, VIR_DOMAIN_FEATURE_PRIVNET, + VIR_DOMAIN_FEATURE_DISABLE_S3, + VIR_DOMAIN_FEATURE_DISABLE_S4, VIR_DOMAIN_FEATURE_LAST }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4033644..ee9e169 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4691,6 +4691,12 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, "-no-acpi"); } + if (def->features & (1 << VIR_DOMAIN_FEATURE_DISABLE_S3)) + virCommandAddArgList(cmd, "-global", "PIIX4_PM.disable_s3=1", NULL); + + if (def->features & (1 << VIR_DOMAIN_FEATURE_DISABLE_S4)) + virCommandAddArgList(cmd, "-global", "PIIX4_PM.disable_s4=1", NULL); + if (!def->os.bootloader) { /* * We prefer using explicit bootindex=N parameters for predictable @@ -8191,6 +8197,17 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, *monConfig = chr; } + } else if (STREQ(arg, "-global") && + STREQ(progargv[i + 1], "PIIX4_PM.disable_s3=1")) { + /* We want to parse only the known "-global" parameters, + * so the ones that we don't know are still added to the + * namespace */ + i++; + def->features |= (1 << VIR_DOMAIN_FEATURE_DISABLE_S3); + } else if (STREQ(arg, "-global") && + STREQ(progargv[i + 1], "PIIX4_PM.disable_s4=1")) { + i++; + def->features |= (1 << VIR_DOMAIN_FEATURE_DISABLE_S4); } else if (STREQ(arg, "-S")) { /* ignore, always added by libvirt */ } else { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0da5c5a..76dd374 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13060,6 +13060,21 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, goto cleanup; } + if (vm->def->features & (1 << VIR_DOMAIN_FEATURE_DISABLE_S3) && + (target == VIR_NODE_SUSPEND_TARGET_MEM || + target == VIR_NODE_SUSPEND_TARGET_HYBRID)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("S3 signals are disabled for this domain")); + goto cleanup; + } + + if (vm->def->features & (1 << VIR_DOMAIN_FEATURE_DISABLE_S4) && + target == VIR_NODE_SUSPEND_TARGET_DISK) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("S4 signals are disabled for this domain")); + goto cleanup; + } + if (priv->agentError) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("QEMU guest agent is not available due to an error")); diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 439218e..7fae39a 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -205,6 +205,9 @@ mymain(void) /* Can't rountrip xenner arch */ /*DO_TEST("input-xen");*/ DO_TEST("misc-acpi"); + DO_TEST("misc-disable-s3"); + DO_TEST("misc-disable-s4"); + DO_TEST("misc-disable-suspends"); DO_TEST("misc-no-reboot"); DO_TEST("misc-uuid"); DO_TEST("net-user"); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args new file mode 100644 index 0000000..dbee64d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ +-M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -global PIIX4_PM.disable_s3=1 -boot c -hda /dev/HostVG/QEMUGuest1 \ +-net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml new file mode 100644 index 0000000..4b2d13e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>8caaa98c-e7bf-5845-126a-1fc316bd1089</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <disable_s3/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s4.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s4.args new file mode 100644 index 0000000..9177904 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s4.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ +-M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -global PIIX4_PM.disable_s4=1 -boot c -hda /dev/HostVG/QEMUGuest1 \ +-net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s4.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s4.xml new file mode 100644 index 0000000..1a27e9f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s4.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>8caaa98c-e7bf-5845-126a-1fc316bd1089</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <disable_s4/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args new file mode 100644 index 0000000..6f63d8b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ +-M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -global PIIX4_PM.disable_s3=1 -global PIIX4_PM.disable_s4=1 -boot c \ +-hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml new file mode 100644 index 0000000..587e80a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>8caaa98c-e7bf-5845-126a-1fc316bd1089</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <disable_s3/> + <disable_s4/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c4aa7c4..c7a3d50 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -561,6 +561,9 @@ mymain(void) DO_TEST("input-usbtablet", NONE); DO_TEST_ERROR("input-xen", QEMU_CAPS_DOMID); DO_TEST("misc-acpi", NONE); + DO_TEST("misc-disable-s3", NONE); + DO_TEST("misc-disable-s4", NONE); + DO_TEST("misc-disable-suspends", NONE); DO_TEST("misc-no-reboot", NONE); DO_TEST("misc-uuid", QEMU_CAPS_NAME, QEMU_CAPS_UUID); DO_TEST("net-user", NONE); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index dcdba4f..f7622b7 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -170,6 +170,9 @@ mymain(void) DO_TEST("input-usbtablet"); DO_TEST("input-xen"); DO_TEST("misc-acpi"); + DO_TEST("misc-disable-s3"); + DO_TEST("misc-disable-s4"); + DO_TEST("misc-disable-suspends"); DO_TEST("misc-no-reboot"); DO_TEST("net-user"); DO_TEST("net-virtio"); -- 1.7.8.6

2 5

[libvirt] [PATCH v2 0/5] Callbacks to detect connection failure
by Daniel P. Berrange 30 Jul '12

30 Jul '12

Update of this series https://www.redhat.com/archives/libvir-list/2012-July/msg00917.html Most significant change is adding a separate API to allow the callback to be unregistered

3 18

[libvirt] [PATCH 0/2] Fix segfault when destroying domain with console open
by Peter Krempa 30 Jul '12

30 Jul '12

In some cases when a newly created domain was destroyed the daemon crashed as it freed the console access data structure sooner than the stream could be freed so that the stream actually called the closing callback taht referenced freed data. Peter Krempa (2): conf: Remove dead code from virConsoleOpen() conf: Remove callback from stream when freeing entries in console hash src/conf/virconsole.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) -- 1.7.8.6

2 5

[libvirt] [PATCH] python: Don't generate bodies for close callback functions
by Peter Krempa 30 Jul '12

30 Jul '12

Commit 6ed5a1b9bd6240b8f2736790e48dd1c284c2e0e1 adds close callback functions to the public API but doesn't add python implementation. This patch sets the function to be written manually (to fix the build), but doesn't implement them yet. --- Pushing under build-breaker rule. --- python/generator.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/python/generator.py b/python/generator.py index 2dada6e..6559ece 100755 --- a/python/generator.py +++ b/python/generator.py @@ -425,6 +425,8 @@ skip_impl = ( 'virDomainGetInterfaceParameters', 'virDomainGetCPUStats', 'virDomainGetDiskErrors', + 'virConnectUnregisterCloseCallback', + 'virConnectRegisterCloseCallback', ) qemu_skip_impl = ( -- 1.7.8.6

1 0

[libvirt] [PATCH][TCK] Add test for memory set and get
by Kyla Zhang 30 Jul '12

30 Jul '12

Add test for memory/maxmem set and get --- scripts/domain/310-memory-set-get.t | 98 +++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) create mode 100644 scripts/domain/310-memory-set-get.t diff --git a/scripts/domain/310-memory-set-get.t b/scripts/domain/310-memory-set-get.t new file mode 100644 index 0000000..b4dde65 --- /dev/null +++ b/scripts/domain/310-memory-set-get.t @@ -0,0 +1,98 @@ +# -*- perl -*- +# +# Copyright (C) 2012-2013 Red Hat, Inc. +# Copyright (C) 2012-2013 Kyla Zhang <weizhan(a)redhat.com> +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/310-memory-set-get.t: test set and get memory/max memory + +=head1 DESCRIPTION + +The test case validates that the set memory, set max memory and get +max memory works well for domain. + +=cut + +use strict; +use warnings; + +use Test::More tests => 15; + +use Sys::Virt::TCK; +use Sys::Virt::TCK::NetworkHelpers; +use Test::Exception; +use File::Spec::Functions qw(catfile catdir rootdir); + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { $tck->cleanup if $tck; } + +diag "Define a new real domain, default memory is 524288"; +my $dom_name ="tck310memtest"; + +my $dom = prepare_test_disk_and_vm($tck, $conn, $dom_name); + +diag "Set max memory for domain"; +lives_ok(sub { $dom->set_max_memory("1048576") }, "Set max memory succeed"); + +diag "Get max memory for domain when domain is inactive"; +is($dom->get_max_memory(), 1048576, "Get max memory is same as set value 1048576"); + +diag "Start inactive domain"; +$dom->create; +ok($dom->get_id() > 0, "running domain has an ID > 0"); +sleep(30); + +diag "Set memory for current state"; +lives_ok(sub { $dom->set_memory("624288", Sys::Virt::Domain::MEM_CONFIG) }, "Set memory succeed in persistent config"); + +diag "get memory of running domain"; +is($dom->get_info()->{memory}, 524288, "Get current memory is 524288"); + +diag "Get max memory for domain when domain is active"; +is($dom->get_max_memory(), 1048576, "Get max memory is same as set value 1048576"); + +diag "Set memory for current state"; +lives_ok(sub { $dom->set_memory("724288", Sys::Virt::Domain::MEM_CURRENT) }, "Set memory succeed in current state"); +sleep(3); + +diag "Check memory of running domain"; +is($dom->get_info()->{memory}, 724288, "Get current memory is same as set value 724288"); + +diag "Set memory for live state"; +lives_ok(sub { $dom->set_memory("824288", Sys::Virt::Domain::MEM_LIVE) }, "Set memory succeed in live state"); +sleep(3); + +diag "Check memory of running domain"; +is($dom->get_info()->{memory}, 824288, "Get current memory is same as set value 824288"); + +diag "Try setting max memory when domain is running"; +ok_error(sub { $dom->set_max_memory("1048576") }, "not allowed to set max memory when domain is running"); + +diag "Destroying the transient domain"; +$dom->destroy; + +diag "Check memory of shutdown domain"; +is($dom->get_info()->{memory}, 624288, "Get memory is 624288 when domain is shutdown"); + +diag "Set max memory with set_memory"; +lives_ok(sub { $dom->set_memory("1148576", Sys::Virt::Domain::MEM_MAXIMUM) }, "Set max memory succeed with set_memory"); + +diag "Get max memory for domain"; +is($dom->get_info()->{maxMem}, 1148576, "Get max memory is same as set value 1148576"); + +diag "Try setting live state memory when domain is shutdown"; +ok_error(sub { $dom->set_memory("824288", Sys::Virt::Domain::MEM_LIVE) }, "not allowed to set live state memory when domain is shutdown"); -- 1.7.1

1 0

[libvirt] [glib PATCH V4] Add bindings for virDomainRestore*()
by Jovanka Gulicoska 30 Jul '12

30 Jul '12

--- libvirt-gobject/libvirt-gobject-connection.c | 164 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 20 ++++ libvirt-gobject/libvirt-gobject.sym | 3 + 3 files changed, 187 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 3a99034..b4a7af4 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1605,3 +1605,167 @@ gvir_connection_get_capabilities_finish(GVirConnection *conn, return g_object_ref(caps); } + +/** + * gvir_connection_restore_domain_from_file: + * @conn: a #GVirConnection + * @filename: path to input file + * @custom_conf: (allow-none): configuration for domain or NULL + * @flags: the flags + * + * Returns: TRUE on success, FALSE otherwise + * + * Restores the domain saved with #gvir_domain_save_to_file + */ +gboolean gvir_connection_restore_domain_from_file(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GError **err) +{ + GVirConnectionPrivate *priv; + int ret; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail((filename != NULL), FALSE); + g_return_val_if_fail((err == NULL) || (*err == NULL), FALSE); + + priv = conn->priv; + + if (flags || (custom_conf != NULL)) { + gchar *custom_xml = NULL; + + if (custom_conf != NULL) + custom_xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(custom_conf)); + + ret = virDomainRestoreFlags(priv->conn, filename, custom_xml, flags); + g_free (custom_xml); + } + else { + ret = virDomainRestore(priv->conn, filename); + } + + if (ret < 0) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to restore domain"); + + return FALSE; + } + + return TRUE; +} + +typedef struct { + gchar *filename; + GVirConfigDomain *custom_conf; + guint flags; +} DomainRestoreFromFileData; + +static void restore_domain_from_file_data_free(DomainRestoreFromFileData *data) +{ + g_free(data->filename); + if (custom_conf != NULL) + g_object_unref(data->custom_conf); + g_slice_free(DomainRestoreFromFileData, data); +} + + +static void +gvir_connection_restore_domain_from_file_helper + (GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirConnection *conn = GVIR_CONNECTION(object); + DomainRestoreFromFileData *data; + GError *err = NULL; + + data = g_simple_async_result_get_op_res_gpointer(res); + + if (!gvir_connection_restore_domain_from_file(conn, data->filename, + data->custom_conf, + data->flags, &err)) + g_simple_async_result_take_error(res, err); +} + +/** + * gvir_connection_restore_domain_from_file_async: + * @conn: a #GVirConnection + * @filename: path to input file + * @custom_conf: (allow-none): configuration for domain + * @flags: the flags + * @cancellable: (allow-none) (transfer none):cancallation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_connection_restore_domain_from_file + */ +void +gvir_connection_restore_domain_from_file_async(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + DomainRestoreFromFileData *data; + + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + g_return_if_fail(filename != NULL); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + + data = g_slice_new0(DomainRestoreFromFileData); + data->filename = g_strdup(filename); + if (custom_conf != NULL) + data->custom_conf = g_object_ref(custom_conf); + data->flags = flags; + + res = g_simple_async_result_new + (G_OBJECT(conn), + callback, + user_data, + gvir_connection_restore_domain_from_file_async); + g_simple_async_result_set_op_res_gpointer + (res, + data, + (GDestroyNotify)restore_domain_from_file_data_free); + + g_simple_async_result_run_in_thread + (res, + gvir_connection_restore_domain_from_file_helper, + G_PRIORITY_DEFAULT, + cancellable); + + g_object_unref(res); +} + +/** + * gvir_connection_restore_domain_from_file_finish: + * @conn: a #GVirConnection + * @result: (transfer none): async method result + * @err: Place-holder for possible errors + * + * Finishes the operation started by #gvir_restore_domain_from_file_async. + * + * Returns: TRUE if domain was restored successfully, FALSE otherwise. + */ +gboolean +gvir_connection_restore_domain_from_file_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail(g_simple_async_result_is_valid + (result, G_OBJECT(conn), + gvir_connection_restore_domain_from_file_async), + FALSE); + + if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), + err)) + return FALSE; + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index c80eecf..d658b01 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -202,6 +202,26 @@ gvir_connection_get_capabilities_finish(GVirConnection *conn, GAsyncResult *result, GError **err); +gboolean +gvir_connection_restore_domain_from_file(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GError **err); + +void +gvir_connection_restore_domain_from_file_async(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean +gvir_connection_restore_domain_from_file_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err); G_END_DECLS #endif /* __LIBVIRT_GOBJECT_CONNECTION_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 54a093a..42c90ef 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -31,6 +31,9 @@ LIBVIRT_GOBJECT_0.0.8 { gvir_connection_create_storage_pool; gvir_connection_start_domain; gvir_connection_get_node_info; + gvir_connection_restore_domain_from_file; + gvir_connection_restore_domain_from_file_async; + gvir_connection_restore_domain_from_file_finish; gvir_domain_device_get_type; gvir_domain_device_get_domain; -- 1.7.10.4

2 1

[libvirt] [PATCH] daemon: libvirtd quit after timeout period without resources checking
by Guannan Ren 30 Jul '12

30 Jul '12

Remove resources checking code for libvirtd to quit after timeout period. The way we support this is the same as the libvirtd signal handling, just set srv->quit to 1. --- daemon/libvirtd.c | 16 +--------------- daemon/libvirtd.pod.in | 5 +---- src/rpc/virnetserver.c | 18 +++--------------- src/rpc/virnetserver.h | 6 +----- 4 files changed, 6 insertions(+), 39 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index ffbe067..d53f020 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -575,17 +575,6 @@ error: return -1; } - -static int daemonShutdownCheck(virNetServerPtr srv ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) -{ - if (virStateActive()) - return 0; - - return 1; -} - - /* * Set up the logging environment * By default if daemonized all errors go to the logfile libvirtd.log, @@ -1242,10 +1231,7 @@ int main(int argc, char **argv) { if (timeout != -1) { VIR_DEBUG("Registering shutdown timeout %d", timeout); - virNetServerAutoShutdown(srv, - timeout, - daemonShutdownCheck, - NULL); + virNetServerAutoShutdown(srv, timeout); } if ((daemonSetupSignals(srv)) < 0) { diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in index 57a3b27..6b77f21 100644 --- a/daemon/libvirtd.pod.in +++ b/daemon/libvirtd.pod.in @@ -54,10 +54,7 @@ Use this name for the PID file, overriding the default value. =item B<-t, --timeout> I<SECONDS> -Exit after timeout period (in seconds) elapse with no client connections -or registered resources. Be aware that resources such as autostart -networks will result in never reaching the timeout, even when there are -no client connections. +Exit after timeout period (in seconds) elapse with no client connections. =item B<-v, --verbose> diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 248ad9f..515ad79 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -105,8 +105,6 @@ struct _virNetServer { virNetTLSContextPtr tls; unsigned int autoShutdownTimeout; - virNetServerAutoShutdownFunc autoShutdownFunc; - void *autoShutdownOpaque; virNetServerClientInitHook clientInitHook; void *clientInitOpaque; @@ -433,16 +431,10 @@ bool virNetServerIsPrivileged(virNetServerPtr srv) void virNetServerAutoShutdown(virNetServerPtr srv, - unsigned int timeout, - virNetServerAutoShutdownFunc func, - void *opaque) + unsigned int timeout) { virNetServerLock(srv); - srv->autoShutdownTimeout = timeout; - srv->autoShutdownFunc = func; - srv->autoShutdownOpaque = opaque; - virNetServerUnlock(srv); } @@ -663,12 +655,8 @@ static void virNetServerAutoShutdownTimer(int timerid ATTRIBUTE_UNUSED, virNetServerPtr srv = opaque; virNetServerLock(srv); - - if (srv->autoShutdownFunc(srv, srv->autoShutdownOpaque)) { - VIR_DEBUG("Automatic shutdown triggered"); - srv->quit = 1; - } - + VIR_DEBUG("Automatic shutdown triggered"); + srv->quit = 1; virNetServerUnlock(srv); } diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 92f741a..d0231e5 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -46,16 +46,12 @@ virNetServerPtr virNetServerNew(size_t min_workers, virNetServerClientInitHook clientInitHook, void *opaque); -typedef int (*virNetServerAutoShutdownFunc)(virNetServerPtr srv, void *opaque); - void virNetServerRef(virNetServerPtr srv); bool virNetServerIsPrivileged(virNetServerPtr srv); void virNetServerAutoShutdown(virNetServerPtr srv, - unsigned int timeout, - virNetServerAutoShutdownFunc func, - void *opaque); + unsigned int timeout); typedef void (*virNetServerSignalFunc)(virNetServerPtr srv, siginfo_t *info, void *opaque); -- 1.7.7.5

2 2

[libvirt] Dumping network traffic
by Hendrik Schwartke 30 Jul '12

30 Jul '12

I'm currently working on a feature that dumps the network traffic of a virtual interface over the streaming api of libvirt. The goal is to offer the possiblity to debug network related problems of guests without the need to have access to a shell on the host. E.g. "virsh iface-dumptraffic virbr0 icmp | tcpdump -n -r -" prints all icmp traffic on virbr0 to stdout. The code below is only a proof of concept, but it should be possible to recognize what I have in mind and how I want to implement it. So I would appreciate any comments on that!

4 13

[libvirt] libvirt + kvm external snapshots: use case?
by Cole Robinson 29 Jul '12

29 Jul '12

Forgive my ignorance, but I'm trying to fill in some details for a Fedora feature page: https://fedoraproject.org/w/index.php?title=Features/Virt_Live_Snapshots Yet things aren't working quite as expected in my tests. I'm trying to think of this from an end user use case perspective. For example - I want to test some changes to my vm, and either throw them away, or commit them to my base disk image. - I want to have a base disk image, but have multiple snapshots with various mutually exclusive VM changes in each, like one snapshot with libvirt 0.7.0 installed, another with 0.8.0 installed. I want to switch between them (maybe those assumptions are off base to begin with) So for a running guest, I do: virsh snapshot-create-as myvm snapshot1 "snapshot1 description" --disk-only virsh snapshot-create-as myvm snapshot2 "snapshot2 description" --disk-only I make some changes that I want to discard, so I try and switch back to the older vm and want to switch back to an older snapshot state, odo: virsh snapshot-revert myvm snapshot1 But I get: 'revert to external disk snapshot not supported yet'. Hmm, that kind of invalidates all my use cases then. Additionally I don't see any API option for merging snapshots, to fold my changes in snapshot2 into parent snapshot1 or similar. I tried using snapshot-delete, but that also fails with external disk snapshots: 'deletion of 1 external disk snapshots not supported yet' Additionally, there's the --atomic option to snapshot-create-as, but it fails for guests with more than 1 snapshotable disks: 'atomic live snapshot of multiple disks is unsupported'. But isn't that what some of the recent qemu additions explicitly supposed to support (that's the impression I got from jtc)? So am I missing anything? If not, are things just not fully wired up or are there missing chunks of functionality? And what's the use case for the current impl of disk snapshoting (while I've read around and found lot's of info about the implementation side of things, not too much about intended uses)? Thanks, Cole

3 4

[libvirt] [PATCH] esx: Improve error reporting for unknown VI types
by Matthias Bolte 29 Jul '12

29 Jul '12

Print the actual unknown type name instead of <other> for AnyType objects. --- src/esx/esx_vi.c | 2 +- src/esx/esx_vi_types.c | 36 +++++++++++++++++++++++++----------- src/esx/esx_vi_types.h | 1 + 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index b1b5d70..9fa37e1 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1481,7 +1481,7 @@ esxVI_Enumeration_CastFromAnyType(const esxVI_Enumeration *enumeration, virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting type '%s' but found '%s'"), esxVI_Type_ToString(enumeration->type), - esxVI_Type_ToString(anyType->type)); + esxVI_AnyType_TypeToString(anyType)); return -1; } diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 9e67eff..cbc92d6 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -533,8 +533,8 @@ * Macros to implement dynamic dispatched functions */ -#define ESX_VI__TEMPLATE__DISPATCH(_actual_type, __type, _dispatch, \ - _error_return) \ +#define ESX_VI__TEMPLATE__DISPATCH(_actual_type, _actual_type_name, __type, \ + _dispatch, _error_return) \ switch (_actual_type) { \ _dispatch \ \ @@ -543,8 +543,8 @@ \ default: \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Call to %s for unexpected type '%s'"), __FUNCTION__,\ - esxVI_Type_ToString(_actual_type)); \ + _("Call to %s for unexpected type '%s'"), \ + __FUNCTION__, _actual_type_name); \ return _error_return; \ } @@ -586,7 +586,9 @@ #define ESX_VI__TEMPLATE__DYNAMIC_FREE(__type, _dispatch, _body) \ ESX_VI__TEMPLATE__FREE(__type, \ - ESX_VI__TEMPLATE__DISPATCH(item->_type, __type, _dispatch, \ + ESX_VI__TEMPLATE__DISPATCH(item->_type, \ + esxVI_Type_ToString(item->_type), \ + __type, _dispatch, \ /* nothing */) \ _body) @@ -620,14 +622,18 @@ #define ESX_VI__TEMPLATE__DYNAMIC_CAST_FROM_ANY_TYPE(__type, _dispatch) \ ESX_VI__TEMPLATE__CAST_FROM_ANY_TYPE_EXTRA(__type, esxVI_##__type, \ - ESX_VI__TEMPLATE__DISPATCH(anyType->type, __type, _dispatch, -1), \ + ESX_VI__TEMPLATE__DISPATCH(anyType->type, \ + esxVI_AnyType_TypeToString(anyType), \ + __type, _dispatch, -1), \ /* nothing */) #define ESX_VI__TEMPLATE__DYNAMIC_SERIALIZE(__type, _dispatch, _serialize) \ ESX_VI__TEMPLATE__SERIALIZE_EXTRA(__type, \ - ESX_VI__TEMPLATE__DISPATCH(item->_type, __type, _dispatch, -1), \ + ESX_VI__TEMPLATE__DISPATCH(item->_type, \ + esxVI_Type_ToString(item->_type), \ + __type, _dispatch, -1), \ _serialize) @@ -683,7 +689,7 @@ esxVI_GetActualObjectType(xmlNodePtr node, esxVI_Type baseType, *actualType = esxVI_Type_FromString(type); - if (*actualType == esxVI_Type_Undefined) { + if (*actualType == esxVI_Type_Undefined || *actualType == esxVI_Type_Other) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown value '%s' for %s 'type' property"), type, esxVI_Type_ToString(baseType)); @@ -862,6 +868,16 @@ ESX_VI__TEMPLATE__FREE(AnyType, VIR_FREE(item->value); }) +const char * +esxVI_AnyType_TypeToString(esxVI_AnyType *anyType) +{ + if (anyType->type == esxVI_Type_Other) { + return anyType->other; + } else { + return esxVI_Type_ToString(anyType->type); + } +} + int esxVI_AnyType_ExpectType(esxVI_AnyType *anyType, esxVI_Type type) { @@ -869,9 +885,7 @@ esxVI_AnyType_ExpectType(esxVI_AnyType *anyType, esxVI_Type type) virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting type '%s' but found '%s'"), esxVI_Type_ToString(type), - anyType->type != esxVI_Type_Other - ? esxVI_Type_ToString(anyType->type) - : anyType->other); + esxVI_AnyType_TypeToString(anyType)); return -1; } diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h index 3d843bf..d412a8f 100644 --- a/src/esx/esx_vi_types.h +++ b/src/esx/esx_vi_types.h @@ -154,6 +154,7 @@ struct _esxVI_AnyType { int esxVI_AnyType_Alloc(esxVI_AnyType **anyType); void esxVI_AnyType_Free(esxVI_AnyType **anyType); +const char *esxVI_AnyType_TypeToString(esxVI_AnyType *anyType); int esxVI_AnyType_ExpectType(esxVI_AnyType *anyType, esxVI_Type type); int esxVI_AnyType_DeepCopy(esxVI_AnyType **dest, esxVI_AnyType *src); int esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType); -- 1.7.4.1

2 2

[libvirt] [glib PATCH V3] Add bindings for virDomainRestore*()
by Jovanka Gulicoska 29 Jul '12

29 Jul '12

--- libvirt-gobject/libvirt-gobject-connection.c | 160 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 20 ++++ libvirt-gobject/libvirt-gobject.sym | 3 + 3 files changed, 183 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 3a99034..54e4d2c 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1605,3 +1605,163 @@ gvir_connection_get_capabilities_finish(GVirConnection *conn, return g_object_ref(caps); } + +/** + * gvir_connection_domain_restore_from_file: + * @conn: a #GVirConnection + * @filename: path to input file + * @custom_conf: (allow-none): configuration for domain or NULL + * @flags: the flags + * + * Returns: TRUE on success, FALSE otherwise + */ +gboolean gvir_connection_domain_restore_from_file(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GError **err) +{ + GVirConnectionPrivate *priv; + int ret; + + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail((filename != NULL), FALSE); + g_return_val_if_fail((err == NULL) || (*err == NULL), FALSE); + + priv = conn->priv; + + if(flags || (custom_conf != NULL)) { + gchar *custom_xml = NULL; + + if(custom_conf != NULL) + custom_xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(custom_conf)); + + ret = virDomainRestoreFlags(priv->conn, filename, custom_xml, flags); + g_free (custom_xml); + } + else { + ret = virDomainRestore(priv->conn, filename); + } + + if(ret < 0) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to restore domain"); + + return FALSE; + } + + return TRUE; +} + +typedef struct { + gchar *filename; + GVirConfigDomain *custom_conf; + guint flags; +} DomainRestoreFromFileData; + +static void domain_restore_from_file_data_free(DomainRestoreFromFileData *data) +{ + g_free(data->filename); + g_object_unref(data->custom_conf); + g_slice_free(DomainRestoreFromFileData, data); +} + + +static void +gvir_connection_domain_restore_from_file_helper + (GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirConnection *conn = GVIR_CONNECTION(object); + DomainRestoreFromFileData *data; + GError *err = NULL; + + data = g_simple_async_result_get_op_res_gpointer(res); + + if(!gvir_connection_domain_restore_from_file(conn, data->filename, + data->custom_conf, + data->flags, &err)) + g_simple_async_result_take_error(res, err); +} + +/** + * gvir_connection_domain_restore_async: + * @conn: a #GVirConnection + * @filename: path to input file + * @custom_conf: (allow-none): configuration for domain + * @flags: the flags + * @cancellable: (allow-none) (transfer none):cancallation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_connection_domain_restore + */ +void +gvir_connection_domain_restore_from_file_async(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + DomainRestoreFromFileData *data; + + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + g_return_if_fail(filename != NULL); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + + data = g_slice_new0(DomainRestoreFromFileData); + data->filename = g_strdup(filename); + if(custom_conf != NULL) + data->custom_conf = g_object_ref(custom_conf); + data->flags = flags; + + res = g_simple_async_result_new + (G_OBJECT(conn), + callback, + user_data, + gvir_connection_domain_restore_from_file_async); + g_simple_async_result_set_op_res_gpointer + (res, data, + (GDestroyNotify)domain_restore_from_file_data_free); + + g_simple_async_result_run_in_thread + (res, + gvir_connection_domain_restore_from_file_helper, + G_PRIORITY_DEFAULT, + cancellable); + + g_object_unref(res); +} + +/** + * gvir_connection_domain_finish: + * @conn: a #GVirConnection + * @result: (transfer none): async method result + * @err: Place-holder for possible errors + * + * Finishes the operation started by #gvir_domain_restore_async. + * + * Returns: TRUE if domain was restored successfully, FALSE otherwise. + */ +gboolean +gvir_connection_domain_restore_from_file_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail(g_simple_async_result_is_valid + (result, G_OBJECT(conn), + gvir_connection_domain_restore_from_file_async), + FALSE); + + if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), + err)) + return FALSE; + + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index c80eecf..f475918 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -202,6 +202,26 @@ gvir_connection_get_capabilities_finish(GVirConnection *conn, GAsyncResult *result, GError **err); +gboolean +gvir_connection_domain_restore_from_file(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GError **err); + +void +gvir_connection_domain_restore_from_file_async(GVirConnection *conn, + gchar *filename, + GVirConfigDomain *custom_conf, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean +gvir_connection_domain_restore_from_file_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err); G_END_DECLS #endif /* __LIBVIRT_GOBJECT_CONNECTION_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 54a093a..a2b0428 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -31,6 +31,9 @@ LIBVIRT_GOBJECT_0.0.8 { gvir_connection_create_storage_pool; gvir_connection_start_domain; gvir_connection_get_node_info; + gvir_connection_domain_restore_from_file; + gvir_connection_domain_restore_from_file_async; + gvir_connection_domain_restore_from_file_finish; gvir_domain_device_get_type; gvir_domain_device_get_domain; -- 1.7.10.4

2 1

[libvirt] [PATCH v4 3/3] ESX: Add routines to interface driver
by Ata E Husain Bohra 28 Jul '12

28 Jul '12

Updated the variable names to match vSphere terminology. Signed-off-by: Ata E Husain Bohra <ata.husain(a)hotmail.com> --- src/esx/esx_interface_driver.c | 179 ++++++++++++++++++++-------------------- src/esx/esx_vi.c | 30 +++---- src/esx/esx_vi.h | 6 +- 3 files changed, 107 insertions(+), 108 deletions(-) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 0b07259..ab8c13b 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -75,31 +75,32 @@ static int esxNumOfInterfaces(virConnectPtr conn) { esxPrivate *priv = conn->interfacePrivateData; - esxVI_HostVirtualNic *virtualNicList = NULL; - const esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; int count = 0; if (esxVI_EnsureSession(priv->primary) < 0 || - esxVI_LookupVirtualNicList(priv->primary, &virtualNicList) < 0) { + esxVI_LookupHostVirtualNicList(priv->primary, + &hostVirtualNicList) < 0) { goto cleanup; } - if (virtualNicList == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + if (hostVirtualNicList == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve vNic List")); goto cleanup; } - for (virtualNic = virtualNicList; - virtualNic != NULL; - virtualNic = virtualNic->_next) { + for (hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL; + hostVirtualNic = hostVirtualNic->_next) { count++; } cleanup: - esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_HostVirtualNic_Free(&hostVirtualNicList); return count; } @@ -119,27 +120,27 @@ static int esxListInterfaces(virConnectPtr conn, char **names, int maxnames) { esxPrivate *priv = conn->interfacePrivateData; - esxVI_HostVirtualNic *virtualNicList = NULL; - const esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; int result = -1; int i = 0; if (esxVI_EnsureSession(priv->primary) < 0 || - esxVI_LookupVirtualNicList(priv->primary, - &virtualNicList) < 0) { + esxVI_LookupHostVirtualNicList(priv->primary, + &hostVirtualNicList) < 0) { goto cleanup; } - if (virtualNicList == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + if (hostVirtualNicList == NULL) { + virReportError(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); + for (i= 0, hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL && i < maxnames; + ++i, hostVirtualNic = hostVirtualNic->_next) { + names[i] = strdup(hostVirtualNic->device); if (names[i] == NULL) { for(;i >=0;--i) { @@ -152,7 +153,7 @@ esxListInterfaces(virConnectPtr conn, char **names, int maxnames) result = i; cleanup: - esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_HostVirtualNic_Free(&hostVirtualNicList); return result; } @@ -174,41 +175,42 @@ static virInterfacePtr esxInterfaceLookupByName(virConnectPtr conn, const char *name) { esxPrivate *priv = conn->interfacePrivateData; - esxVI_HostVirtualNic *virtualNicList = NULL; - const esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; virInterfacePtr ret = NULL; if (esxVI_EnsureSession(priv->primary) < 0 || - esxVI_LookupVirtualNicList(priv->primary, - &virtualNicList) < 0) { + esxVI_LookupHostVirtualNicList(priv->primary, + &hostVirtualNicList) < 0) { goto cleanup; } - if (virtualNicList == 0) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + if (hostVirtualNicList == 0) { + virReportError(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", + for(hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL; + hostVirtualNic = hostVirtualNic->_next) { + if (STREQ(hostVirtualNic->device, name)) { + if (hostVirtualNic->spec == NULL || + hostVirtualNic->spec->mac == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Malformed HostVirtualNicSpec")); goto cleanup; } - ret = virGetInterface(conn, virtualNic->device, virtualNic->spec->mac); + ret = virGetInterface(conn, hostVirtualNic->device, + hostVirtualNic->spec->mac); break; } } cleanup: - esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_HostVirtualNic_Free(&hostVirtualNicList); return ret; } @@ -219,41 +221,42 @@ static virInterfacePtr esxInterfaceLookupByMACString(virConnectPtr conn, const char *mac) { esxPrivate *priv = conn->interfacePrivateData; - esxVI_HostVirtualNic *virtualNicList = NULL; - const esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = NULL; virInterfacePtr ret = NULL; if (esxVI_EnsureSession(priv->primary) < 0 || - esxVI_LookupVirtualNicList(priv->primary, - &virtualNicList) < 0) { + esxVI_LookupHostVirtualNicList(priv->primary, + &hostVirtualNicList) < 0) { goto cleanup; } - if (virtualNicList == 0) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + if (hostVirtualNicList == 0) { + virReportError(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", + for(hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL; + hostVirtualNic = hostVirtualNic->_next) { + if (hostVirtualNic->spec == NULL || + hostVirtualNic->spec->mac == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Malformed HostVirtualNicSpec")); goto cleanup; } - if (STREQ(virtualNic->spec->mac, mac)) { - ret = virGetInterface(conn, virtualNic->device, virtualNic->spec->mac); + if (STREQ(hostVirtualNic->spec->mac, mac)) { + ret = virGetInterface(conn, hostVirtualNic->device, + hostVirtualNic->spec->mac); break; } } cleanup: - esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_HostVirtualNic_Free(&hostVirtualNicList); return ret; } @@ -264,14 +267,14 @@ static char* esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) { esxPrivate *priv = iface->conn->interfacePrivateData; - esxVI_HostVirtualNic *virtualNicList = NULL; - const esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_HostVirtualNic *hostVirtualNicList = NULL; + const esxVI_HostVirtualNic *hostVirtualNic = 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_HostVirtualSwitch *hostVirtualSwitchList = NULL; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *hostSystem = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; @@ -304,7 +307,7 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) dynamicProperty = dynamicProperty->_next) { if (STREQ(dynamicProperty->name, "config.network.vnic")) { if (esxVI_HostVirtualNic_CastListFromAnyType( - dynamicProperty->val, &virtualNicList) < 0) { + dynamicProperty->val, &hostVirtualNicList) < 0) { goto cleanup; } } else if (STREQ(dynamicProperty->name, @@ -315,7 +318,7 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) } } else if (STREQ(dynamicProperty->name, "config.network.vswitch")) { if (esxVI_HostVirtualSwitch_CastListFromAnyType - (dynamicProperty->val, &virtualSwitchList) < 0) { + (dynamicProperty->val, &hostVirtualSwitchList) < 0) { goto cleanup; } } else if (STREQ(dynamicProperty->name, "config.network.pnic")) { @@ -333,36 +336,36 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) } } - if (!virtualNicList || + if (!hostVirtualNicList || !ipRouteConfig || - !virtualSwitchList || + !hostVirtualSwitchList || !portGroupList) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(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)) { + for (hostVirtualNic = hostVirtualNicList; + hostVirtualNic != NULL; + hostVirtualNic = hostVirtualNic->_next) { + if (STREQ(hostVirtualNic->device, iface->name)) { break; } } - if (virtualNic == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + if (hostVirtualNic == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not find Interface")); goto cleanup; } - if (esxVI_LookupPhysicalNicFromPortGroup(virtualNic->portgroup, + if (esxVI_LookupPhysicalNicFromPortGroup(hostVirtualNic->portgroup, portGroupList, - virtualSwitchList, + hostVirtualSwitchList, physicalNicList, &matchingPhysicalNicList) < 0) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No Physical NIC found matching Virtual NIC's portgroup")); goto cleanup; } @@ -377,24 +380,24 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) } 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; + def->name = strdup(hostVirtualNic->device); + if (hostVirtualNic->spec->mtu && hostVirtualNic->spec->mtu->value) { + def->mtu = hostVirtualNic->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); + if (!use_static && hostVirtualNic->spec->mac) { + def->mac = strdup(hostVirtualNic->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", + if (hostVirtualNic->spec->ip->subnetMask && + *hostVirtualNic->spec->ip->subnetMask && + inet_aton(hostVirtualNic->spec->ip->subnetMask, &addr) == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error parsing netmask")); goto cleanup; } @@ -424,13 +427,13 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) } def->protos[i]->family = strdup("ipv4"); - if (virtualNic->spec->ip->dhcp == 1) { + if (hostVirtualNic->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) { + if (hostVirtualNic->spec->ip->dhcp != 1 || !use_static) { + if (hostVirtualNic->spec->ip->ipAddress && + *hostVirtualNic->spec->ip->ipAddress) { int j =0; if (VIR_ALLOC_N(def->protos[i]->ips, def->protos[i]->nips) < 0) { @@ -444,7 +447,7 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) goto cleanup; } def->protos[i]->ips[0]->address = - strdup(virtualNic->spec->ip->ipAddress); + strdup(hostVirtualNic->spec->ip->ipAddress); def->protos[i]->ips[0]->prefix = masklen; def->protos[i]->gateway = strdup(ipRouteConfig->defaultGateway); @@ -493,11 +496,11 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) } cleanup: - esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_HostVirtualNic_Free(&hostVirtualNicList); esxVI_PhysicalNic_Free(&physicalNicList); esxVI_PhysicalNic_Free(&matchingPhysicalNicList); esxVI_HostPortGroup_Free(&portGroupList); - esxVI_HostVirtualSwitch_Free(&virtualSwitchList); + esxVI_HostVirtualSwitch_Free(&hostVirtualSwitchList); esxVI_HostIpRouteConfig_Free(&ipRouteConfig); esxVI_ObjectContent_Free(&hostSystem); esxVI_String_Free(&propertyNameList); @@ -517,7 +520,7 @@ esxInterfaceUndefine(virInterfacePtr iface) priv->primary, priv->primary->hostSystem->configManager->networkSystem, iface->name) < 0) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error deleting interface")); return -1; } @@ -528,10 +531,8 @@ esxInterfaceUndefine(virInterfacePtr iface) static int -esxInterfaceCreate(virInterfacePtr iface, unsigned int flags) +esxInterfaceCreate(virInterfacePtr iface ATTRIBUTE_UNUSED, unsigned int flags) { - iface->conn->interfacePrivateData = NULL; - virCheckFlags(0, -1); /* ESX interfaces are always active */ @@ -541,10 +542,8 @@ esxInterfaceCreate(virInterfacePtr iface, unsigned int flags) static int -esxInterfaceDestroy(virInterfacePtr iface, unsigned int flags) +esxInterfaceDestroy(virInterfacePtr iface ATTRIBUTE_UNUSED, unsigned int flags) { - iface->conn->interfacePrivateData = NULL; - virCheckFlags(0, -1); /* ESX interfaces can not be deactivated */ diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index e5f92b2..41c9be3 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -4570,8 +4570,8 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx, } int -esxVI_LookupVirtualNicList(esxVI_Context* ctx, - esxVI_HostVirtualNic** virtualNicList) +esxVI_LookupHostVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** hostVirtualNicList) { int result = -1; esxVI_String *propertyNameList = NULL; @@ -4585,7 +4585,7 @@ esxVI_LookupVirtualNicList(esxVI_Context* ctx, } if (hostSystem == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve the HostSystem object")); goto cleanup; @@ -4596,7 +4596,7 @@ esxVI_LookupVirtualNicList(esxVI_Context* ctx, dynamicProperty = dynamicProperty->_next) { if (STREQ(dynamicProperty->name, "config.network.vnic")) { if (esxVI_HostVirtualNic_CastListFromAnyType(dynamicProperty->val, - virtualNicList) < 0) { + hostVirtualNicList) < 0) { goto cleanup; } break; @@ -4618,20 +4618,20 @@ int esxVI_LookupPhysicalNicFromPortGroup( const char *portgroup, const esxVI_HostPortGroup *portGroupList, - const esxVI_HostVirtualSwitch *virtualSwitchList, + const esxVI_HostVirtualSwitch *hostVirtualSwitchList, const esxVI_PhysicalNic *physicalNicList, esxVI_PhysicalNic **ret_physicalNicList) { int result = -1; const esxVI_HostPortGroup *portGroup = NULL; - const esxVI_HostVirtualSwitch *virtualSwitch = NULL; + const esxVI_HostVirtualSwitch *hostVirtualSwitch = 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", + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No Portgroup found!")); goto cleanup; } @@ -4646,28 +4646,28 @@ esxVI_LookupPhysicalNicFromPortGroup( } if (portGroup == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(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)) { + for (hostVirtualSwitch = hostVirtualSwitchList; + hostVirtualSwitch != NULL; + hostVirtualSwitch = hostVirtualSwitch->_next) { + if (STREQ(portGroup->spec->vswitchName, hostVirtualSwitch->name)) { break; } } - if (virtualSwitch == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + if (hostVirtualSwitch == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not find Virtual Switch")); goto cleanup; } /* Go through all physical nics */ - for (pnicKey = virtualSwitch->pnic; + for (pnicKey = hostVirtualSwitch->pnic; pnicKey != NULL; pnicKey = pnicKey->_next) { /* O(n^2), but probably faster than a hash due to small N */ diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 54b53ec..9f75d84 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -499,13 +499,13 @@ int esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, int esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersion); -int esxVI_LookupVirtualNicList(esxVI_Context* ctx, - esxVI_HostVirtualNic** virtualNicList); +int esxVI_LookupHostVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** virtualNicList); int esxVI_LookupPhysicalNicFromPortGroup( const char *portgroup, const esxVI_HostPortGroup *portGroupList, - const esxVI_HostVirtualSwitch *virtualSwitchList, + const esxVI_HostVirtualSwitch *hostVirtualSwitchList, const esxVI_PhysicalNic *physicalNicList, esxVI_PhysicalNic **ret_physicalNicList); -- 1.7.9.5

1 0

[libvirt] [PATCH v4 2/3] ESX: Add routines to interface driver
by Ata E Husain Bohra 28 Jul '12

28 Jul '12

Use ATTRIBUTE_UNUSED for unused variable. Signed-off-by: Ata E Husain Bohra <ata.husain(a)hotmail.com> --- 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 1c1aaf2..0b07259 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