- Devel - libvirt List Archives

[libvirt] [PATCH] nwfilter: Free nwfilter hash of virConnectPtr
by Matthias Bolte 19 Apr '10

19 Apr '10

And close the driver on connection close. --- src/datatypes.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index ebcd538..25962a6 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -129,6 +129,20 @@ virSecretFreeName(void *secret_, const char *name ATTRIBUTE_UNUSED) } /** + * virNWFilterPoolFreeName: + * @pool: a nwfilter pool object + * + * Destroy the nwfilter pool object, this is just used by the nwfilter pool hash callback. + * + * Returns 0 in case of success and -1 in case of failure. + */ +static int +virNWFilterPoolFreeName(virNWFilterPtr pool, const char *name ATTRIBUTE_UNUSED) +{ + return (virUnrefNWFilter(pool)); +} + +/** * virDomainSnapshotFreeName: * @snapshot: a domain snapshotobject * @@ -212,6 +226,8 @@ failed: virHashFree(ret->nodeDevices, (virHashDeallocator) virNodeDeviceFree); if (ret->secrets != NULL) virHashFree(ret->secrets, virSecretFreeName); + if (ret->nwfilterPools != NULL) + virHashFree(ret->nwfilterPools, (virHashDeallocator) virNWFilterPoolFreeName); virMutexDestroy(&ret->lock); VIR_FREE(ret); @@ -245,6 +261,8 @@ virReleaseConnect(virConnectPtr conn) { virHashFree(conn->nodeDevices, (virHashDeallocator) virNodeDeviceFree); if (conn->secrets != NULL) virHashFree(conn->secrets, virSecretFreeName); + if (conn->nwfilterPools != NULL) + virHashFree(conn->nwfilterPools, (virHashDeallocator) virNWFilterPoolFreeName); virResetError(&conn->err); @@ -292,6 +310,8 @@ virUnrefConnect(virConnectPtr conn) { conn->deviceMonitor->close (conn); if (conn->secretDriver) conn->secretDriver->close (conn); + if (conn->nwfilterDriver) + conn->nwfilterDriver->close (conn); if (conn->driver) conn->driver->close (conn); -- 1.6.3.3

2 2

[libvirt] [PATCH 00/30] Cleanup translation marks and remove virConnectPtr from error reporting
by Matthias Bolte 17 Apr '10

17 Apr '10

This set of patches removes translation marks from log messages, adds missing translation marks to error messages and removes the virConnectPtr parameter from all error reporting functions. This series is large, but most of it was done by search and replace. 105 files changed, 3574 insertions(+), 4005 deletions(-) Matthias

6 96

[libvirt] [PATCH] Mark internal.h for translation
by Jiri Denemark 17 Apr '10

17 Apr '10

Patch for virCheckFlags added a message marked for translation into internal.h without including that file in POTFILES.in. I've just pushed the following patch. Jirka >From 39f3fee4a48ef39a2baab25e306d94238d1e1361 Mon Sep 17 00:00:00 2001 Message-Id: <39f3fee4a48ef39a2baab25e306d94238d1e1361.1271439006.git.jdenemar(a)redhat.com> From: Jiri Denemark <jdenemar(a)redhat.com> Date: Fri, 16 Apr 2010 19:21:10 +0200 Subject: [PATCH] Mark internal.h for translation Mail-Followup-To: libvir-list(a)redhat.com --- po/POTFILES.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 406e4c2..58e7358 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -25,6 +25,7 @@ src/esx/esx_vi_methods.c src/esx/esx_vi_types.c src/esx/esx_vmx.c src/interface/netcf_driver.c +src/internal.h src/libvirt.c src/lxc/lxc_container.c src/lxc/lxc_controller.c -- 1.7.0.4

1 0

[libvirt] unable to set security context (NFSv4 problem?)
by Harald Dunkel 16 Apr '10

16 Apr '10

Hi folks, Since I have moved the image file of a domain to an NFS partition I get an error message at start time: # virsh start mydomain error: Failed to start domain mydomain error: unable to set security context '110:140' on '/storage/mydomain/vda.img': Invalid argument The /storage partition is mounted with these options: # cat /proc/mounts | grep /storage nasl002:/storage/ /storage nfs4 rw,relatime,vers=4,rsize=1048576,wsize=1048576,namlen=255,hard,proto=tcp,port=0,timeo=600,retrans=2,sec=sys,clientaddr=172.19.96.31,addr=172.19.96.213 0 0 If I use a local disk instead, then there is no such problem. libvirt is version 0.7.7-4, as included with Debian. Any helpful comment would be highly appreciated. Regards Harri

4 5

[libvirt] [PATCH] Don't build nwfilter examples when not building libvirtd
by Matthew Booth 16 Apr '10

16 Apr '10

* Makefile.am: Make examples/xml/nwfilter conditional on WITH_LIBVIRTD --- Makefile.am | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index dd334b5..40352c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,8 +5,11 @@ GENHTML = genhtml SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \ python tests po examples/domain-events/events-c examples/hellolibvirt \ - examples/dominfo examples/domsuspend examples/python examples/apparmor \ - examples/xml/nwfilter + examples/dominfo examples/domsuspend examples/python examples/apparmor + +if WITH_LIBVIRTD + SUBDIRS += examples/xml/nwfilter +endif ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 -- 1.6.6.1

2 1

[libvirt] [PATCH] esx: Add nwfilter driver stub
by Matthias Bolte 16 Apr '10

16 Apr '10

This stops libvirt trying to connect to a non-existing libvirtd on the ESX server. --- src/Makefile.am | 1 + src/esx/esx_driver.c | 4 +- src/esx/esx_nwfilter_driver.c | 86 +++++++++++++++++++++++++++++++++++++++++ src/esx/esx_nwfilter_driver.h | 29 ++++++++++++++ 4 files changed, 119 insertions(+), 1 deletions(-) create mode 100644 src/esx/esx_nwfilter_driver.c create mode 100644 src/esx/esx_nwfilter_driver.h diff --git a/src/Makefile.am b/src/Makefile.am index df577ea..66dc349 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -247,6 +247,7 @@ ESX_DRIVER_SOURCES = \ esx/esx_storage_driver.c esx/esx_storage_driver.h \ esx/esx_device_monitor.c esx/esx_device_monitor.h \ esx/esx_secret_driver.c esx/esx_secret_driver.h \ + esx/esx_nwfilter_driver.c esx/esx_nwfilter_driver.h \ esx/esx_util.c esx/esx_util.h \ esx/esx_vi.c esx/esx_vi.h \ esx/esx_vi_methods.c esx/esx_vi_methods.h \ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index e3340c9..a2fc85c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -39,6 +39,7 @@ #include "esx_storage_driver.h" #include "esx_device_monitor.h" #include "esx_secret_driver.h" +#include "esx_nwfilter_driver.h" #include "esx_private.h" #include "esx_vi.h" #include "esx_vi_methods.h" @@ -3834,7 +3835,8 @@ esxRegister(void) esxNetworkRegister() < 0 || esxStorageRegister() < 0 || esxDeviceRegister() < 0 || - esxSecretRegister() < 0) { + esxSecretRegister() < 0 || + esxNWFilterRegister() < 0) { return -1; } diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c new file mode 100644 index 0000000..71d7aca --- /dev/null +++ b/src/esx/esx_nwfilter_driver.c @@ -0,0 +1,86 @@ + +/* + * esx_nwfilter_driver.c: nwfilter driver functions for managing VMware ESX + * firewall rules + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include "internal.h" +#include "util.h" +#include "memory.h" +#include "logging.h" +#include "uuid.h" +#include "esx_private.h" +#include "esx_nwfilter_driver.h" +#include "esx_vi.h" +#include "esx_vi_methods.h" +#include "esx_util.h" + +#define VIR_FROM_THIS VIR_FROM_ESX + + + +static virDrvOpenStatus +esxNWFilterOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (STRNEQ(conn->driver->name, "ESX")) { + return VIR_DRV_OPEN_DECLINED; + } + + conn->nwfilterPrivateData = conn->privateData; + + return VIR_DRV_OPEN_SUCCESS; +} + + + +static int +esxNWFilterClose(virConnectPtr conn) +{ + conn->interfacePrivateData = NULL; + + return 0; +} + + + +static virNWFilterDriver esxNWFilterDriver = { + "ESX", /* name */ + esxNWFilterOpen, /* open */ + esxNWFilterClose, /* close */ + NULL, /* numOfNWFilters */ + NULL, /* listNWFilters */ + NULL, /* nwfilterLookupByName */ + NULL, /* nwfilterLookupByUUID */ + NULL, /* defineXML */ + NULL, /* undefine */ + NULL, /* getXMLDesc */ +}; + + + +int +esxNWFilterRegister(void) +{ + return virRegisterNWFilterDriver(&esxNWFilterDriver); +} diff --git a/src/esx/esx_nwfilter_driver.h b/src/esx/esx_nwfilter_driver.h new file mode 100644 index 0000000..64cceab --- /dev/null +++ b/src/esx/esx_nwfilter_driver.h @@ -0,0 +1,29 @@ + +/* + * esx_nwfilter_driver.h: nwfilter driver functions for managing VMware ESX + * firewall rules + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef __ESX_NWFILTER_DRIVER_H__ +# define __ESX_NWFILTER_DRIVER_H__ + +int esxNWFilterRegister(void); + +#endif /* __ESX_NWFILTER_DRIVER_H__ */ -- 1.6.3.3

3 3

[libvirt] [PATCH v2 0/2] Enhance checking of supported flags in drivers
by Jiri Denemark 16 Apr '10

16 Apr '10

I think we need a simple and consistent way of checking whether flags passed to API entry points in drivers are valid/supported or not. So far some entry points don't check flags at all and some checks for 0 when no flags are expected/supported. The first patch introduces a macro which can be called with a whitelist of supported flags (more info about it inside the patch). The second patch changes all API calls introduced in 0.8.0 release to use the macro for checking valid flags. I'm not sure if we can change existing API calls to do the same as it could break some badly written apps which pass invalid flags. My opinion is that we may often do that as such apps don't use the API in a documented/valid way. Changes in v2: - virCheckFlags moved from checks.h to existing internal.h Jirka Jiri Denemark (2): Introduce virCheckFlags for consistent flags checking Use virCheckFlags for APIs added in 0.8.0 src/esx/esx_driver.c | 43 ++++++++++++------------- src/internal.h | 23 +++++++++++++ src/nwfilter/nwfilter_driver.c | 4 ++- src/qemu/qemu_driver.c | 68 +++++++++++++++++++--------------------- src/storage/storage_driver.c | 6 +--- src/vbox/vbox_tmpl.c | 41 ++++++++++++++++------- src/xen/xend_internal.c | 4 ++ 7 files changed, 111 insertions(+), 78 deletions(-)

3 7

[libvirt] [PATCH] nwfilter: Clear all state tracking from a drop rule
by Stefan Berger 16 Apr '10

16 Apr '10

Don't use state-matching in a drop rule. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1380,13 +1380,16 @@ _iptablesCreateRuleInstance(int directio return 0; } - if (match) - virBufferVSprintf(&buf, " %s", match); - if (rule->action == VIR_NWFILTER_RULE_ACTION_ACCEPT) target = accept_target; - else + else { target = "DROP"; + match = NULL; + } + + if (match) + virBufferVSprintf(&buf, " %s", match); + virBufferVSprintf(&buf, " -j %s" CMD_DEF_POST CMD_SEPARATOR

2 2

[libvirt] [PATCH] Fix network hotplug to use device_add in QEMU
by Daniel P. Berrange 16 Apr '10

16 Apr '10

The initial boot of VMs uses -device for NICs where available. The corresponding monitor command is device_add, but the network hotplug code was still using device_del by mistake. * src/qemu/qemu_driver.c: Use device_add for NIC hotplug where available --- src/qemu/qemu_driver.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5c15c1d..9e0a353 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7210,17 +7210,29 @@ static int qemudDomainAttachNetDevice(virConnectPtr conn, close(tapfd); tapfd = -1; - if (!(nicstr = qemuBuildNicStr(net, NULL, vlan))) - goto try_remove; + if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { + if (!(nicstr = qemuBuildNicDevStr(net, vlan))) + goto try_remove; + } else { + if (!(nicstr = qemuBuildNicStr(net, NULL, vlan))) + goto try_remove; + } qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorAddPCINetwork(priv->mon, nicstr, - &guestAddr) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - goto try_remove; + if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { + if (qemuMonitorAddDevice(priv->mon, nicstr) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, vm); + goto try_remove; + } + } else { + if (qemuMonitorAddPCINetwork(priv->mon, nicstr, + &guestAddr) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, vm); + goto try_remove; + } + net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; + memcpy(&net->info.addr.pci, &guestAddr, sizeof(guestAddr)); } - net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - memcpy(&net->info.addr.pci, &guestAddr, sizeof(guestAddr)); qemuDomainObjExitMonitorWithDriver(driver, vm); ret = 0; -- 1.6.6.1

2 1

[libvirt] [PATCH] Fix error reporting for getfd + host_net_add in QEMU
by Daniel P. Berrange 16 Apr '10

16 Apr '10

If either of the getfd or host_net_add monitor commands return any text, this indicates an error condition. Don't ignore this! * src/qemu/qemu_monitor_text.c: Report errors for getfd and host_net_add --- src/qemu/qemu_monitor_text.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 48c9a54..6ad07b1 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1666,6 +1666,13 @@ int qemuMonitorTextSendFileHandle(qemuMonitorPtr mon, goto cleanup; } + if (STRNEQ(reply, "")) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to send TAP file handle: %s"), + reply); + goto cleanup; + } + ret = 0; cleanup: @@ -1725,11 +1732,16 @@ int qemuMonitorTextAddHostNetwork(qemuMonitorPtr mon, if (qemuMonitorCommand(mon, cmd, &reply) < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, - _("failed to close fd in qemu with '%s'"), cmd); + _("failed to add host net with '%s'"), cmd); goto cleanup; } - /* XXX error messages here ? */ + if (STRNEQ(reply, "")) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to add host net: %s"), + reply); + goto cleanup; + } ret = 0; -- 1.6.6.1

2 1