- Devel - libvirt List Archives

[libvirt] [PATCH] Fix usage of virReportSystemError
by Jiri Denemark 28 Nov '14

28 Nov '14

virReportSystemError is reserved for reporting system errors, calling it with VIR_ERR_* error codes produces error messages that do not make any sense, such as internal error: guest failed to start: Kernel doesn't support user namespace: Link has been severed We should prohibit wrong usage with a syntax-check rule. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- cfg.mk | 5 +++++ src/lxc/lxc_container.c | 4 ++-- src/openvz/openvz_conf.c | 4 ++-- src/qemu/qemu_migration.c | 12 ++++++------ src/util/virnetdevopenvswitch.c | 22 +++++++++++----------- src/util/virobject.c | 4 ++-- 6 files changed, 28 insertions(+), 23 deletions(-) diff --git a/cfg.mk b/cfg.mk index d829a3c..3f35479 100644 --- a/cfg.mk +++ b/cfg.mk @@ -983,6 +983,11 @@ sc_prohibit_devname: halt='avoid using 'devname' as FreeBSD exports the symbol' \ $(_sc_search_regexp) +sc_prohibit_system_error_with_vir_err: + @prohibit='\bvirReportSystemError *\(VIR_ERR_' \ + halt='do not use virReportSystemError with VIR_ERR_* error codes' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 334a1df..3b08b86 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -2309,8 +2309,8 @@ int lxcContainerStart(virDomainDefPtr def, VIR_DEBUG("Enable user namespace"); cflags |= CLONE_NEWUSER; } else { - virReportSystemError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Kernel doesn't support user namespace")); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Kernel doesn't support user namespace")); VIR_FREE(stack); return -1; } diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index edf37d0..4b918c0 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -405,8 +405,8 @@ openvzReadFSConf(virDomainDefPtr def, /* Ensure that we can multiply by 1024 without overflowing. */ if (barrier > ULLONG_MAX / 1024 || limit > ULLONG_MAX / 1024) { - virReportSystemError(VIR_ERR_OVERFLOW, "%s", - _("Unable to parse quota")); + virReportError(VIR_ERR_OVERFLOW, "%s", + _("Unable to parse quota")); goto error; } fs->space_soft_limit = barrier * 1024; /* unit is bytes */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a1b1458..74cda96 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -369,9 +369,9 @@ qemuMigrationCookieNetworkAlloc(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, case VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH: if (virNetDevOpenvswitchGetMigrateData(&mig->net[i].portdata, netptr->ifname) != 0) { - virReportSystemError(VIR_ERR_INTERNAL_ERROR, - _("Unable to run command to get OVS port data for " - "interface %s"), netptr->ifname); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to run command to get OVS port data for " + "interface %s"), netptr->ifname); goto error; } break; @@ -2223,9 +2223,9 @@ qemuDomainMigrateOPDRelocate(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, case VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH: if (virNetDevOpenvswitchSetMigrateData(cookie->network->net[i].portdata, netptr->ifname) != 0) { - virReportSystemError(VIR_ERR_INTERNAL_ERROR, - _("Unable to run command to set OVS port data for " - "interface %s"), netptr->ifname); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to run command to set OVS port data for " + "interface %s"), netptr->ifname); goto cleanup; } break; diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 8ea1def..e5c87bb 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -147,9 +147,9 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, } if (virCommandRun(cmd, NULL) < 0) { - virReportSystemError(VIR_ERR_INTERNAL_ERROR, - _("Unable to add port %s to OVS bridge %s"), - ifname, brname); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to add port %s to OVS bridge %s"), + ifname, brname); goto cleanup; } @@ -181,8 +181,8 @@ int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const ch virCommandAddArgList(cmd, "--timeout=5", "--", "--if-exists", "del-port", ifname, NULL); if (virCommandRun(cmd, NULL) < 0) { - virReportSystemError(VIR_ERR_INTERNAL_ERROR, - _("Unable to delete port %s from OVS"), ifname); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to delete port %s from OVS"), ifname); goto cleanup; } @@ -213,9 +213,9 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) /* Run the command */ if (virCommandRun(cmd, NULL) < 0) { - virReportSystemError(VIR_ERR_INTERNAL_ERROR, - _("Unable to run command to get OVS port data for " - "interface %s"), ifname); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to run command to get OVS port data for " + "interface %s"), ifname); goto cleanup; } @@ -247,9 +247,9 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) /* Run the command */ if (virCommandRun(cmd, NULL) < 0) { - virReportSystemError(VIR_ERR_INTERNAL_ERROR, - _("Unable to run command to set OVS port data for " - "interface %s"), ifname); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to run command to set OVS port data for " + "interface %s"), ifname); goto cleanup; } diff --git a/src/util/virobject.c b/src/util/virobject.c index 6cb84b4..9ccd310 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -220,8 +220,8 @@ void *virObjectLockableNew(virClassPtr klass) return NULL; if (virMutexInit(&obj->lock) < 0) { - virReportSystemError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to initialize mutex")); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to initialize mutex")); virObjectUnref(obj); return NULL; } -- 2.1.3

2 1

[libvirt] [PATCH] Revert "ip link needs 'name' in 3.16 to create the veth pair"
by Martin Kletzander 27 Nov '14

27 Nov '14

This reverts commit 433b427ff853ab72d32573d415e6ec569b77c7cb. The patch was added in order to overcome a bug in iproute2 and since it was properly identified as a bug, particularly in openSUSE 13.2, and it is being worked on [1], the best solution for libvirt seems to be to keep the old behaviour. [1] https://bugzilla.novell.com/show_bug.cgi?id=907093 --- src/util/virnetdevveth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index ad30e1d..e9d6f9c 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -89,7 +89,7 @@ static int virNetDevVethGetFreeNum(int startDev) * @veth2: pointer to return name for container end of veth pair * * Creates a veth device pair using the ip command: - * ip link add name veth1 type veth peer name veth2 + * ip link add veth1 type veth peer name veth2 * If veth1 points to NULL on entry, it will be a valid interface on * return. veth2 should point to NULL on entry. * @@ -146,7 +146,7 @@ int virNetDevVethCreate(char** veth1, char** veth2) } cmd = virCommandNew("ip"); - virCommandAddArgList(cmd, "link", "add", "name", + virCommandAddArgList(cmd, "link", "add", *veth1 ? *veth1 : veth1auto, "type", "veth", "peer", "name", *veth2 ? *veth2 : veth2auto, -- 2.1.3

3 4

[libvirt] [PATCH] tests: fix documentation for mocking methods
by Martin Kletzander 27 Nov '14

27 Nov '14

It looks like it was copy-pasted, so in case anyone wonders what some of those methods do without looking at them, and for the sake of completeness, fix them. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/virmock.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/virmock.h b/tests/virmock.h index 8352e30..a69c836 100644 --- a/tests/virmock.h +++ b/tests/virmock.h @@ -175,8 +175,8 @@ * @retval: the return value * @...: pairs of parameter type and parameter name * - * Define a replacement for @name which invokes wrap_@name - * forwarding on all args, and passing back the return value. + * Define a replacement for @name which doesn't invoke anything, just + * returns @retval. */ # define VIR_MOCK_STUB_RET_ARGS(name, rettype, retval, ...) \ rettype name(VIR_MOCK_ARGTYPENAMES_UNUSED(__VA_ARGS__)) \ @@ -188,9 +188,10 @@ * VIR_MOCK_STUB_RET_VOID: * @name: the symbol name to replace * @rettype: the return type + * @retval: value to return * - * Define a replacement for @name which invokes wrap_@name - * with no arguments, and passing back the return value. + * Define a replacement for @name which doesn't invoke anything, just + * returns @retval. */ # define VIR_MOCK_STUB_RET_VOID(name, rettype, retval) \ rettype name(void) \ @@ -203,8 +204,8 @@ * @name: the symbol name to replace * @...: pairs of parameter type and parameter name * - * Define a replacement for @name which invokes wrap_@name - * forwarding on all args, but with no return value. + * Define a replacement for @name which doesn't invoke or return + * anything. */ # define VIR_MOCK_STUB_VOID_ARGS(name, ...) \ void name(VIR_MOCK_ARGTYPENAMES_UNUSED(__VA_ARGS__)) \ @@ -217,8 +218,8 @@ * VIR_MOCK_STUB_VOID_VOID: * @name: the symbol name to replace * - * Define a replacement for @name which invokes wrap_@name - * with no arguments and with no return value + * Define a replacement for @name which doesn't invoke or return + * anything. */ # define VIR_MOCK_STUB_VOID_VOID(name) \ void name(void) \ -- 2.1.3

1 1

[libvirt] [PATCH] qemu: fix block{commit,copy} abort handling
by Erik Skultety 27 Nov '14

27 Nov '14

When a block{commit,copy} job was aborted on a domain, block job handler did not process it correctly, leaving a phantom job in the background. Any further calls to any blockjob causes "block <jobtype> still active" error. This patch fixes the blockjob handler so that it checks not only for VIR_DOMAIN_BLOCK_JOB_FAILED status, but VIR_DOMAIN_BLOCK_JOB_CANCELED status as well, followed by our existing cleanup routine. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1135169 --- src/qemu/qemu_process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c3ee40b..7e53515 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1108,7 +1108,8 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, if (status == VIR_DOMAIN_BLOCK_JOB_READY) { disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_READY; save = true; - } else if (status == VIR_DOMAIN_BLOCK_JOB_FAILED) { + } else if (status == VIR_DOMAIN_BLOCK_JOB_FAILED || + status == VIR_DOMAIN_BLOCK_JOB_CANCELED) { virStorageSourceFree(disk->mirror); disk->mirror = NULL; disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE; -- 1.9.3

2 1

[libvirt] [PATCH] qemu: Don't track quiesced state of FSs
by Michal Privoznik 27 Nov '14

27 Nov '14

https://bugzilla.redhat.com/show_bug.cgi?id=1160084 As of b6d4dad11b (1.2.5) we are trying to keep the status of FSFreeze in the guest. Even though I've tried to fixed couple of corner cases (6ea54769ba18), it occurred to me just recently, that the approach is broken by design. Firstly, there are many other ways to talk to qemu-ga (even through libvirt) that filesystems can be thawed (e.g. qemu-agent-command) without libvirt noticing. Moreover, there are plenty of ways to thaw filesystems without even qemu-ga noticing (yes, qemu-ga keeps internal track of FSFreeze status). So, instead of keeping the track ourselves, or asking qemu-ga for stale state, it's the best to let qemu-ga deal with that (and possibly let guest kernel propagate an error). Moreover, there's one bug with the following approach, if fsfreeze command failed, we've executed fsthaw subsequently. So issuing domfsfreeze in virsh gave the following result: virsh # domfsfreeze gentoo Froze 1 filesystem(s) virsh # domfsfreeze gentoo error: Unable to freeze filesystems error: internal error: unable to execute QEMU agent command 'guest-fsfreeze-freeze': The command guest-fsfreeze-freeze has been disabled for this instance virsh # domfsfreeze gentoo Froze 1 filesystem(s) virsh # domfsfreeze gentoo error: Unable to freeze filesystems error: internal error: unable to execute QEMU agent command 'guest-fsfreeze-freeze': The command guest-fsfreeze-freeze has been disabled for this instance Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 5 ----- src/qemu/qemu_domain.h | 2 -- src/qemu/qemu_driver.c | 44 ++------------------------------------------ src/qemu/qemu_process.c | 5 ----- 4 files changed, 2 insertions(+), 54 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6513c78..4061ca1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -563,9 +563,6 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) virBufferAddLit(buf, "</devices>\n"); } - if (priv->quiesced) - virBufferAddLit(buf, "<quiesced/>\n"); - return 0; } @@ -750,8 +747,6 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) } VIR_FREE(nodes); - priv->quiesced = virXPathBoolean("boolean(./quiesced)", ctxt) == 1; - return 0; error: diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index e4ea4ce..ebb282a 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -187,8 +187,6 @@ struct _qemuDomainObjPrivate { char **qemuDevices; /* NULL-terminated list of devices aliases known to QEMU */ bool hookRun; /* true if there was a hook run over this domain */ - - bool quiesced; /* true if filesystems are quiesced */ }; typedef enum { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 07da3e3..ad5f70a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12704,34 +12704,17 @@ qemuDomainPrepareDiskChainElement(virQEMUDriverPtr driver, * is sent but failed, and number of frozen filesystems on success. If -2 is * returned, FSThaw should be called revert the quiesced status. */ static int -qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver, +qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, const char **mountpoints, unsigned int nmountpoints) { qemuDomainObjPrivatePtr priv = vm->privateData; - virQEMUDriverConfigPtr cfg; int frozen; - if (priv->quiesced) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is already quiesced")); - return -1; - } - if (!qemuDomainAgentAvailable(priv, true)) return -1; - priv->quiesced = true; - - cfg = virQEMUDriverGetConfig(driver); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { - priv->quiesced = false; - virObjectUnref(cfg); - return -1; - } - virObjectUnref(cfg); - qemuDomainObjEnterAgent(vm); frozen = qemuAgentFSFreeze(priv->agent, mountpoints, nmountpoints); qemuDomainObjExitAgent(vm); @@ -12741,24 +12724,17 @@ qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver, /* Return -1 on error, otherwise number of thawed filesystems. */ static int -qemuDomainSnapshotFSThaw(virQEMUDriverPtr driver, +qemuDomainSnapshotFSThaw(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, bool report) { qemuDomainObjPrivatePtr priv = vm->privateData; - virQEMUDriverConfigPtr cfg; int thawed; virErrorPtr err = NULL; if (!qemuDomainAgentAvailable(priv, report)) return -1; - if (!priv->quiesced && report) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not quiesced")); - return -1; - } - qemuDomainObjEnterAgent(vm); if (!report) err = virSaveLastError(); @@ -12769,18 +12745,6 @@ qemuDomainSnapshotFSThaw(virQEMUDriverPtr driver, virFreeError(err); - if (!report || thawed >= 0) { - priv->quiesced = false; - - cfg = virQEMUDriverGetConfig(driver); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { - /* Revert the statuses when we failed to save them. */ - priv->quiesced = true; - thawed = -1; - } - virObjectUnref(cfg); - } - return thawed; } @@ -18033,10 +17997,6 @@ qemuDomainFSFreeze(virDomainPtr dom, } ret = qemuDomainSnapshotFSFreeze(driver, vm, mountpoints, nmountpoints); - if (ret == -2) { - qemuDomainSnapshotFSThaw(driver, vm, false); - ret = -1; - } endjob: if (!qemuDomainObjEndJob(driver, vm)) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c3ee40b..382d802 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -539,10 +539,6 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED, priv = vm->privateData; if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_RESET); - /* Clear some domain runtime information. For instance, - * fsfreeze won't survive domain reset. This, however, - * required the domain status file to be rewritten onto disk. */ - priv->quiesced = false; if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); @@ -4985,7 +4981,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort); priv->nbdPort = 0; - priv->quiesced = false; if (priv->agent) { qemuAgentClose(priv->agent); -- 2.0.4

2 1

[libvirt] [libvirt-glib PATCHv3] Add gvir_domain_open_graphics_fd()
by Zeeshan Ali (Khattak) 27 Nov '14

27 Nov '14

Add binding for virDomainOpenGraphicsFD. If virDomainOpenGraphicsFD is not available, it means we are dealing with older libvirt so we create the socket pair ourselves if that is the case. --- configure.ac | 4 ++ libvirt-gobject/libvirt-gobject-domain.c | 72 ++++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 4 ++ libvirt-gobject/libvirt-gobject.sym | 5 +++ 4 files changed, 85 insertions(+) diff --git a/configure.ac b/configure.ac index 8cc3fca..bcb5cda 100644 --- a/configure.ac +++ b/configure.ac @@ -93,6 +93,10 @@ m4_if(m4_version_compare([2.61a.100], LIBVIRT_GLIB_COMPILE_WARNINGS PKG_CHECK_MODULES(LIBVIRT, libvirt >= $LIBVIRT_REQUIRED) +# virDomainOpenGraphicsFD was introduced in libvirt 1.2.8 +AC_CHECK_LIB([virt], + [virDomainOpenGraphicsFD], + [AC_DEFINE([HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD], 1, [Have virDomainOpenGraphicsFD?])]) enable_tests=no PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_TEST_REQUIRED, [enable_tests=yes], diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 8df30d7..5a5189f 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -25,6 +25,9 @@ #include <libvirt/virterror.h> #include <string.h> +#ifndef HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD +#include <sys/socket.h> +#endif #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" @@ -1222,6 +1225,75 @@ cleanup: } /** + * gvir_domain_open_graphics_fd: + * @dom: the domain + * @idx: the graphics index + * @flags: extra flags, currently unused + * + * This will create a socket pair connected to the graphics backend of @dom. One + * end of the socket will be returned on success, and the other end is handed to + * the hypervisor. If @dom has multiple graphics backends configured, then @idx + * will determine which one is opened, starting from @idx 0. + * + * Returns: An fd on success, -1 on failure. + * + * Since: 0.2.0 + */ +int gvir_domain_open_graphics_fd(GVirDomain *dom, + guint idx, + unsigned int flags, + GError **err) +{ + GVirDomainPrivate *priv; + int ret = -1; +#ifndef HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD + int pair[2]; +#endif + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), -1); + g_return_val_if_fail(err == NULL || *err == NULL, -1); + + priv = dom->priv; + +#ifdef HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD + ret = virDomainOpenGraphicsFD(priv->handle, idx, flags); + if (ret <= 0) { + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to open graphics"); + goto end; + } + +#else + if (socketpair(PF_UNIX, SOCK_STREAM, 0, pair) < 0) { + g_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Failed to create socket pair"); + goto end; + } + + if (virDomainOpenGraphics(priv->handle, idx, pair[0], flags) < 0) { + virErrorPtr vir_err; + + vir_err = virGetLastError(); + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Unable to open graphics"); + close(pair[0]); + close(pair[1]); + + goto end; + } + close(pair[0]); + ret = pair[1]; + +#endif + +end: + return ret; +} + +/** * gvir_domain_suspend: * @dom: the domain to suspend * @err: Place-holder for possible errors diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 47ed784..4fe381e 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -332,6 +332,10 @@ gboolean gvir_domain_open_graphics(GVirDomain *dom, int fd, unsigned int flags, GError **err); +int gvir_domain_open_graphics_fd(GVirDomain *dom, + guint idx, + unsigned int flags, + GError **err); gboolean gvir_domain_suspend (GVirDomain *dom, GError **err); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index d18769b..927cad9 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -260,4 +260,9 @@ LIBVIRT_GOBJECT_0.1.9 { gvir_stream_io_condition_get_type; } LIBVIRT_GOBJECT_0.1.5; +LIBVIRT_GOBJECT_0.2.0 { + global: + gvir_domain_open_graphics_fd; +} LIBVIRT_GOBJECT_0.1.9; + # .... define new API here using predicted next version number .... -- 2.1.0

2 1

[libvirt] [PATCH] network: Fix upgrade from libvirt older than 1.2.4
by Jiri Denemark 27 Nov '14

27 Nov '14

Starting from libvirt-1.2.4, network state XML files moved to another directory (see commit b9e95491) and libvirt automatically migrates the network state files to a new location. However, the code used dirent.dt_type which is not supported by all filesystems. Thus, when libvirt is upgraded on a host which uses such filesystem, network state XMLs were not properly moved and running networks disappeared from libvirt. This patch falls back to stat() whenever dirent.dt_type is DT_UNKNOWN to fix this issue. https://bugzilla.redhat.com/show_bug.cgi?id=1167145 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/network/bridge_driver.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6cb421c..7066dfe 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -499,15 +499,34 @@ networkMigrateStateFiles(void) } while ((direrr = virDirRead(dir, &entry, oldStateDir)) > 0) { + if (entry->d_type != DT_UNKNOWN && + entry->d_type != DT_REG) + continue; - if (entry->d_type != DT_REG || - STREQ(entry->d_name, ".") || + if (STREQ(entry->d_name, ".") || STREQ(entry->d_name, "..")) continue; if (virAsprintf(&oldPath, "%s/%s", oldStateDir, entry->d_name) < 0) goto cleanup; + + if (entry->d_type == DT_UNKNOWN) { + struct stat st; + + if (stat(oldPath, &st) < 0) { + virReportSystemError(errno, + _("failed to stat network status file '%s'"), + oldPath); + goto cleanup; + } + + if (!S_ISREG(st.st_mode)) { + VIR_FREE(oldPath); + continue; + } + } + if (virFileReadAll(oldPath, 1024*1024, &contents) < 0) goto cleanup; -- 2.1.3

2 2

[libvirt] [PATCH] qemu: add tun devices to cgroup ACL
by rongqing.li＠windriver.com 27 Nov '14

27 Nov '14

From: Roy Li <rongqing.li(a)windriver.com> When systemd is used as init, CGroup will be enabled by default, and lead to virsh unable to start VM(which is using the tun/tap), since virsh can not access /dev/net/tun device Signed-off-by: Roy Li <rongqing.li(a)windriver.com> --- src/qemu/qemu.conf | 3 ++- src/qemu/qemu_cgroup.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index c6db568..225cd0f 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -272,7 +272,8 @@ # "/dev/null", "/dev/full", "/dev/zero", # "/dev/random", "/dev/urandom", # "/dev/ptmx", "/dev/kvm", "/dev/kqemu", -# "/dev/rtc","/dev/hpet", "/dev/vfio/vfio" +# "/dev/rtc","/dev/hpet", "/dev/vfio/vfio", +# "/dev/net/tun" #] # # RDMA migration requires the following extra files to be added to the list: diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 0e94cae..7c15c07 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -45,7 +45,7 @@ static const char *const defaultDeviceACL[] = { "/dev/random", "/dev/urandom", "/dev/ptmx", "/dev/kvm", "/dev/kqemu", "/dev/rtc", "/dev/hpet", "/dev/vfio/vfio", - NULL, + "/dev/net/tun", NULL, }; #define DEVICE_PTY_MAJOR 136 #define DEVICE_SND_MAJOR 116 diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 30fd27e..2ab7a8d 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -48,6 +48,7 @@ module Test_libvirtd_qemu = { "9" = "/dev/rtc" } { "10" = "/dev/hpet" } { "11" = "/dev/vfio/vfio" } + { "12" = "/dev/net/tun" } } { "save_image_format" = "raw" } { "dump_image_format" = "raw" } -- 2.1.0

1 0

[libvirt] Cloning libvirt
by Kevin Wilson 26 Nov '14

26 Nov '14

Hi, According to the web page you can clone libvirt by: git clone git://libvirt.org/libvirt.git There are places which block access via git connection, but permit git clone by http/https. So my question is: is there also an http/https server from which you can clone it ? Regards, Kevin

2 1

[libvirt] [PATCH 0/2] Testcase fixes for nwfilter.
by Prerna Saxena 26 Nov '14

26 Nov '14

This series adds fixes for nwfilter testcases. Patch 1/2 : Flips result reporting for tests/nwfilterebiptablestest.c in line with other tests. Patch 2/2 : Makes nwfilter testcases more resilient to the presence of locking flags, introduced by Commit dc33e6e4a5a5d42 Prerna Saxena (2): tests : Fix failure reporting for tests/nwfilterebiptablestest.c Tests : Make nwfilter testcases robust against optional locking flags. tests/nwfilterebiptablestest.c | 35 ++++++++++++++--------- tests/nwfilterxml2firewalltest.c | 3 ++ tests/testutils.c | 62 ++++++++++++++++++++++++++++++++++++++++ tests/testutils.h | 6 ++++ 4 files changed, 92 insertions(+), 14 deletions(-) Regards, -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

3 9

[libvirt] [PATCH] test: fix nwfilter tests following changes in virfirewall.c
by Stefan Berger 26 Nov '14

26 Nov '14

Some of the nwfilter tests are now failing since --concurrent shows up in the ebtables command. To avoid this, implement a few functions that allow to set the booleans indicating how the locking is to be done to false, overriding the probing. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/libvirt_private.syms | 3 +++ src/util/virfirewall.c | 18 ++++++++++++++++++ src/util/virfirewall.h | 4 ++++ tests/nwfilterebiptablestest.c | 5 +++++ tests/nwfilterxml2firewalltest.c | 4 ++++ 5 files changed, 34 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2647d36..376826a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1353,7 +1353,10 @@ virFindFileInPath; virFirewallAddRule; virFirewallAddRuleFull; virFirewallApply; +virFirewallEbtablesNotUseLock; virFirewallFree; +virFirewallIp6tablesNotUseLock; +virFirewallIptablesNotUseLock; virFirewallNew; virFirewallRemoveRule; virFirewallRuleAddArg; diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 8496062..5df2a5f 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -108,6 +108,24 @@ static bool iptablesUseLock; static bool ip6tablesUseLock; static bool ebtablesUseLock; +void +virFirewallIptablesNotUseLock(void) +{ + iptablesUseLock = false; +} + +void +virFirewallIp6tablesNotUseLock(void) +{ + ip6tablesUseLock = false; +} + +void +virFirewallEbtablesNotUseLock(void) +{ + ebtablesUseLock = false; +} + static void virFirewallCheckUpdateLock(bool *lockflag, const char *const*args) diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h index 1129219..aa72a76 100644 --- a/src/util/virfirewall.h +++ b/src/util/virfirewall.h @@ -106,4 +106,8 @@ void virFirewallStartRollback(virFirewallPtr firewall, int virFirewallApply(virFirewallPtr firewall); +void virFirewallIptablesNotUseLock(void); +void virFirewallIp6tablesNotUseLock(void); +void virFirewallEbtablesNotUseLock(void); + #endif /* __VIR_FIREWALL_H__ */ diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index e04bc21..e18a6c7 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -24,6 +24,7 @@ #include "testutils.h" #include "nwfilter/nwfilter_ebiptables_driver.h" #include "virbuffer.h" +#include "virfirewall.h" #define __VIR_FIREWALL_PRIV_H_ALLOW__ #include "virfirewallpriv.h" @@ -527,6 +528,10 @@ mymain(void) goto cleanup; } + virFirewallEbtablesNotUseLock(); + virFirewallIptablesNotUseLock(); + virFirewallIp6tablesNotUseLock(); + if (virtTestRun("ebiptablesAllTeardown", testNWFilterEBIPTablesAllTeardown, NULL) < 0) diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c index 01527f4..f6ef0e0 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -479,6 +479,10 @@ mymain(void) goto cleanup; } + virFirewallEbtablesNotUseLock(); + virFirewallIptablesNotUseLock(); + virFirewallIp6tablesNotUseLock(); + DO_TEST("ah"); DO_TEST("ah-ipv6"); DO_TEST("all"); -- 1.9.3

2 1

[libvirt] [PATCH 0/5] Getting virt-sandbox-service to work
by Cédric Bosdonnat 26 Nov '14

26 Nov '14

Hi all, this patch series fixes a few problems I encountered when getting virt-sandbox-service containers with images to work. The very first patch fixes a crasher in virt-aa-helper tests... but we were pretty lucky it didn't explode before: virErrors weren't initialized. Cédric Bosdonnat (5): virt-aa-helper wasn't running virErrorInitialize virt-aa-helper: /etc/libvirt-sandbox/services isn't restricted ip link needs 'name' in 3.16 to create the veth pair lxc: be more patient while resolving symlinks lxc: don't unmount subtree if it contains the source of the mount src/conf/domain_conf.h | 1 + src/lxc/lxc_container.c | 85 ++++++++++++++++++++++++++++++------------- src/security/virt-aa-helper.c | 14 ++++++- src/util/virnetdevveth.c | 4 +- 4 files changed, 74 insertions(+), 30 deletions(-) -- 2.1.2

6 25

[libvirt] [PATCH] storage: remove a redundant NULL assignment
by Chen Hanxiao 26 Nov '14

26 Nov '14

We already did this in virSecretDefFree. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/storage/storage_backend.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 98720f6..440f8b1 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -558,7 +558,6 @@ virStorageGenerateQcowEncryption(virConnectPtr conn, goto cleanup; xml = virSecretDefFormat(def); virSecretDefFree(def); - def = NULL; if (xml == NULL) goto cleanup; -- 1.9.3

2 1

[libvirt] [PATCH RFC] storage: perform btrfs clone if possible
by Chen Hanxiao 26 Nov '14

26 Nov '14

We already had nocow flags in virStorageSource. But when creating RAW file, we don't take advantage of clone of btrfs. This file introduce btrfs_clone_file function, and try to use it when !nocow. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/storage/storage_backend.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 98720f6..f5ea34c 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -156,6 +156,27 @@ enum { #define READ_BLOCK_SIZE_DEFAULT (1024 * 1024) #define WRITE_BLOCK_SIZE_DEFAULT (4 * 1024) +/* + * Perform the O(1) btrfs clone operation, if possible. + * Upon success, return 0. Otherwise, return -1 and set errno. + */ +static inline int +btrfs_clone_file(int dest_fd, int src_fd) +{ +#ifdef __linux__ +# undef BTRFS_IOCTL_MAGICi +# define BTRFS_IOCTL_MAGIC 0x94 +# undef BTRFS_IOC_CLONE +# define BTRFS_IOC_CLONE _IOW (BTRFS_IOCTL_MAGIC, 9, int) + return ioctl(dest_fd, BTRFS_IOC_CLONE, src_fd); +#else + (void) dest_fd; + (void) src_fd; + errno = ENOTSUP; + return -1; +#endif +} + static int ATTRIBUTE_NONNULL(2) virStorageBackendCopyToFD(virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, @@ -200,6 +221,16 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, goto cleanup; } + if (!vol->target.nocow) { + if (btrfs_clone_file(fd, inputfd) == -1) { + if (errno == ENOTSUP) + VIR_DEBUG("btrfs clone not supported, try another way."); + } else { + VIR_DEBUG("btrfs clone findished."); + goto cleanup; + } + } + while (amtread != 0) { int amtleft; -- 1.9.3

4 6

[libvirt] [sandbox][PATCH 0/2] AppArmor support
by Cédric Bosdonnat 26 Nov '14

26 Nov '14

Hi all, Here are 2 patches: one to get apparmor support for virt-sandbox and virt-sandbox-service and 1 to get services with disk image actually start. The AppArmor support doesn't add any parameter to the user, virt-sandbox, just uses either apparmor or selinux depending on the one available... as those can't be running at the same time. Cédric Bosdonnat (2): AppArmor support virt-sandbox-service: mount /var after all other file systems bin/virt-sandbox-service | 21 ++++++++++++-------- libvirt-sandbox/libvirt-sandbox-builder.c | 32 +++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 8 deletions(-) -- 2.1.2

3 5

[libvirt] [PATCH v3 repost] network: Bring netdevs online later
by Matthew Rosato 25 Nov '14

25 Nov '14

Repost of a patch that got lost in the shuffle. The last version (v3) was based on review comments from Martin Kletzander but needs additional review. Here's a link back to the v2 post, which was the last to receive comments: http://www.redhat.com/archives/libvir-list/2014-August/msg01332.html This repost is identical in content to the previous v3 submission, save for retrofit needed. Associated bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1081461 Changes for v3: * Some minor formatting fixes. * in qemuNetworkIfaceConnect, set VIR_NETDEV_TAP_CREATE_IFUP unconditionally. * in qemuDomainAttachNetDevice, call qemuInterfaceStartDevice on for VIR_DOMAIN_NET_TYPE_DIRECT, _BRIDGE and _NETWORK. * in qemuProcessStartCPUs, use 'reason' to determine whether or not qemuInterfaceStartDevices needs to be called. Basically, it needs to be called for any reason that the system would be initializing, as well as potentially after a failed migration. Matthew Rosato (1): network: Bring netdevs online later src/Makefile.am | 3 +- src/conf/domain_conf.h | 2 ++ src/lxc/lxc_process.c | 4 ++- src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_hotplug.c | 8 +++++ src/qemu/qemu_interface.c | 76 +++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_interface.h | 32 ++++++++++++++++++ src/qemu/qemu_process.c | 7 ++++ src/util/virnetdevmacvlan.c | 8 +++-- src/util/virnetdevmacvlan.h | 2 ++ 10 files changed, 140 insertions(+), 5 deletions(-) create mode 100644 src/qemu/qemu_interface.c create mode 100644 src/qemu/qemu_interface.h -- 1.7.9.5

1 1

[libvirt] [PATCH 0/2] prep for backing chain stat reporting
by Eric Blake 25 Nov '14

25 Nov '14

I'm still working on more patches to expose the allocation watermark of backing images during a block commit, but want to get these preliminary patches posted now. Eric Blake (2): virsh: document block.n.allocation stat getstats: add block.n.source stat src/libvirt-domain.c | 16 +++++++++++++--- src/qemu/qemu_driver.c | 36 ++++++++++++++++++++---------------- tools/virsh.pod | 10 +++++++--- 3 files changed, 40 insertions(+), 22 deletions(-) -- 1.9.3

2 7

[libvirt] [python PATCH] event: Add bindings for agent lifecycle event
by Peter Krempa 25 Nov '14

25 Nov '14

Also add the example. --- examples/event-test.py | 13 +++++++++++ libvirt-override.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) mode change 100644 => 100755 examples/event-test.py diff --git a/examples/event-test.py b/examples/event-test.py old mode 100644 new mode 100755 index be7a7d4..acc7f20 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -464,6 +464,15 @@ def blockJobStatusToString(status): blockJobStatus = ( "Completed", "Failed", "Canceled", "Ready", ) return blockJobStatus[status] + +def agentLifecycleStateToString(state): + agentStates = ( "unknown", "connected", "disconnected", ) + return agentStates[state] + +def agentLifecycleReasonToString(reason): + agentReasons = ( "unknown", "domain booted", "channel event", ) + return agentReasons[reason] + def myDomainEventCallback1 (conn, dom, event, detail, opaque): print("myDomainEventCallback1 EVENT: Domain %s(%s) %s %s" % (dom.name(), dom.ID(), domEventToString(event), @@ -517,6 +526,9 @@ def myDomainEventBlockJob2Callback(conn, dom, disk, type, status, opaque): print("myDomainEventBlockJob2Callback: Domain %s(%s) %s on disk %s %s" % (dom.name(), dom.ID(), blockJobTypeToString(type), disk, blockJobStatusToString(status))) def myDomainEventTunableCallback(conn, dom, params, opaque): print("myDomainEventTunableCallback: Domain %s(%s) %s" % (dom.name(), dom.ID(), params)) +def myDomainEventAgentLifecycleCallback(conn, dom, state, reason, opaque): + print("myDomainEventAgentLifecycleCallback: Domain %s(%s) %s %s" % (dom.name(), dom.ID, agentLifecycleStateToString(state), agentLifecycleReasonToString(reason))) + ########################################################################## # Network events @@ -627,6 +639,7 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED, myDomainEventDeviceRemovedCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2, myDomainEventBlockJob2Callback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_TUNABLE, myDomainEventTunableCallback, None) + vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE, myDomainEventAgentLifecycleCallback, None) vc.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE, myNetworkEventLifecycleCallback, None) diff --git a/libvirt-override.c b/libvirt-override.c index a53b46f..af4f386 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6566,6 +6566,61 @@ libvirt_virConnectDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED } #endif /* LIBVIR_CHECK_VERSION(1, 2, 9) */ +#if LIBVIR_CHECK_VERSION(1, 2, 11) +static int +libvirt_virConnectDomainEventAgentLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + int state, + int reason, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret = NULL; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + if (!(dictKey = libvirt_constcharPtrWrap("conn"))) + goto cleanup; + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + if (!(pyobj_dom = libvirt_virDomainPtrWrap(dom))) { + virDomainFree(dom); + goto cleanup; + } + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchDomainEventTunableCallback", + (char*)"OiiO", + pyobj_dom, state, reason, pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + cleanup: + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; + +} +#endif /* LIBVIR_CHECK_VERSION(1, 2, 11) */ + + static PyObject * libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject *self, PyObject *args) @@ -6658,6 +6713,11 @@ libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject *self, cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventTunableCallback); break; #endif /* LIBVIR_CHECK_VERSION(1, 2, 9) */ +#if LIBVIR_CHECK_VERSION(1, 2, 11) + case VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventAgentLifecycleCallback); + break; +#endif /* LIBVIR_CHECK_VERSION(1, 2, 11) */ case VIR_DOMAIN_EVENT_ID_LAST: break; } -- 2.1.0

2 1

[libvirt] [PATCH] dbus: fix arrays of bools
by Eric Blake 25 Nov '14

25 Nov '14

Commit 2aa167ca tried to fix the DBus interaction code to allow callers to use native types instead of 4-byte bools. But in fixing the issue, I missed the case of an arrayref; Conrad Meyer shows the following valid complaint issued by clang: CC util/libvirt_util_la-virdbus.lo util/virdbus.c:956:13: error: cast from 'bool *' to 'dbus_bool_t *' (aka 'unsigned int *') increases required alignment from 1 to 4 [-Werror,-Wcast-align] GET_NEXT_VAL(dbus_bool_t, bool_val, bool, "%d"); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ util/virdbus.c:858:17: note: expanded from macro 'GET_NEXT_VAL' x = (dbustype *)(*xptrptr + (*narrayptr - 1)); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. But fixing that points out that we have NEVER supported arrayrefs of sub-int types (byte, i16, u16, and now bool). Again, while raw types promote, arrays do not; so the macros HAVE to deal with both size possibilities rather than assuming that an arrayref uses the same sizing as the promoted raw type. Obviously, our testsuite wasn't covering as much as it should have. * src/util/virdbus.c (GET_NEXT_VAL): Also fix array cases. (SET_NEXT_VAL): Fix uses of sub-int arrays. * tests/virdbustest.c (testMessageArray, testMessageArrayRef): Test it. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Although this fixes a build-breaker, it is not trivial, and therefore I will wait for a full review. src/util/virdbus.c | 39 +++++++++++++++++++++------------------ tests/virdbustest.c | 29 +++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/src/util/virdbus.c b/src/util/virdbus.c index f27fce7..ee8732c 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -574,11 +574,11 @@ virDBusIsAllowedRefType(const char *sig) } -# define SET_NEXT_VAL(dbustype, vargtype, sigtype, fmt) \ +# define SET_NEXT_VAL(dbustype, vargtype, arrtype, sigtype, fmt) \ do { \ dbustype x; \ if (arrayref) { \ - vargtype *valarray = arrayptr; \ + arrtype valarray = arrayptr; \ x = (dbustype)*valarray; \ valarray++; \ arrayptr = valarray; \ @@ -666,45 +666,48 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, switch (*t) { case DBUS_TYPE_BYTE: - SET_NEXT_VAL(unsigned char, int, *t, "%d"); + SET_NEXT_VAL(unsigned char, int, unsigned char *, *t, "%d"); break; case DBUS_TYPE_BOOLEAN: - SET_NEXT_VAL(dbus_bool_t, int, *t, "%d"); + SET_NEXT_VAL(dbus_bool_t, int, bool *, *t, "%d"); break; case DBUS_TYPE_INT16: - SET_NEXT_VAL(dbus_int16_t, int, *t, "%d"); + SET_NEXT_VAL(dbus_int16_t, int, short *, *t, "%d"); break; case DBUS_TYPE_UINT16: - SET_NEXT_VAL(dbus_uint16_t, unsigned int, *t, "%d"); + SET_NEXT_VAL(dbus_uint16_t, unsigned int, unsigned short *, + *t, "%d"); break; case DBUS_TYPE_INT32: - SET_NEXT_VAL(dbus_int32_t, int, *t, "%d"); + SET_NEXT_VAL(dbus_int32_t, int, int *, *t, "%d"); break; case DBUS_TYPE_UINT32: - SET_NEXT_VAL(dbus_uint32_t, unsigned int, *t, "%u"); + SET_NEXT_VAL(dbus_uint32_t, unsigned int, unsigned int *, + *t, "%u"); break; case DBUS_TYPE_INT64: - SET_NEXT_VAL(dbus_int64_t, long long, *t, "%lld"); + SET_NEXT_VAL(dbus_int64_t, long long, long long *, *t, "%lld"); break; case DBUS_TYPE_UINT64: - SET_NEXT_VAL(dbus_uint64_t, unsigned long long, *t, "%llu"); + SET_NEXT_VAL(dbus_uint64_t, unsigned long long, + unsigned long long *, *t, "%llu"); break; case DBUS_TYPE_DOUBLE: - SET_NEXT_VAL(double, double, *t, "%lf"); + SET_NEXT_VAL(double, double, double *, *t, "%lf"); break; case DBUS_TYPE_STRING: case DBUS_TYPE_OBJECT_PATH: case DBUS_TYPE_SIGNATURE: - SET_NEXT_VAL(char *, char *, *t, "%s"); + SET_NEXT_VAL(char *, char *, char **, *t, "%s"); break; case DBUS_TYPE_ARRAY: @@ -848,23 +851,23 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, # define GET_NEXT_VAL(dbustype, member, vargtype, fmt) \ do { \ - dbustype *x; \ DBusBasicValue v; \ + dbustype *x = (dbustype *)&v.member; \ + vargtype *y; \ if (arrayref) { \ VIR_DEBUG("Use arrayref"); \ vargtype **xptrptr = arrayptr; \ if (VIR_EXPAND_N(*xptrptr, *narrayptr, 1) < 0) \ goto cleanup; \ - x = (dbustype *)(*xptrptr + (*narrayptr - 1)); \ + y = (*xptrptr + (*narrayptr - 1)); \ VIR_DEBUG("Expanded to %zu", *narrayptr); \ } else { \ - x = (dbustype *)&(v.member); \ + y = va_arg(args, vargtype *); \ } \ dbus_message_iter_get_basic(iter, x); \ - if (!arrayref) \ - *va_arg(args, vargtype *) = v.member; \ + *y = *x; \ VIR_DEBUG("Read basic type '" #dbustype "' varg '" #vargtype \ - "' val '" fmt "'", (vargtype)*x); \ + "' val '" fmt "'", (vargtype)*y); \ } while (0) diff --git a/tests/virdbustest.c b/tests/virdbustest.c index 98b4bf6..4ec3c0d 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -183,6 +183,7 @@ static int testMessageArray(const void *args ATTRIBUTE_UNUSED) int in_int32a = 1000000000, out_int32a = 0; int in_int32b = 2000000000, out_int32b = 0; int in_int32c = -2000000000, out_int32c = 0; + bool in_bool[] = { true, false, true }, out_bool[] = { false, true, false}; const char *in_str2 = "World"; char *out_str1 = NULL, *out_str2 = NULL; @@ -195,18 +196,20 @@ static int testMessageArray(const void *args ATTRIBUTE_UNUSED) } if (virDBusMessageEncode(msg, - "sais", + "saiabs", in_str1, 3, in_int32a, in_int32b, in_int32c, + 3, in_bool[0], in_bool[1], in_bool[2], in_str2) < 0) { VIR_DEBUG("Failed to encode arguments"); goto cleanup; } if (virDBusMessageDecode(msg, - "sais", + "saiabs", &out_str1, 3, &out_int32a, &out_int32b, &out_int32c, + 3, &out_bool[0], &out_bool[1], &out_bool[2], &out_str2) < 0) { VIR_DEBUG("Failed to decode arguments"); goto cleanup; @@ -217,6 +220,9 @@ static int testMessageArray(const void *args ATTRIBUTE_UNUSED) VERIFY("int32a", in_int32a, out_int32a, "%d"); VERIFY("int32b", in_int32b, out_int32b, "%d"); VERIFY("int32c", in_int32c, out_int32c, "%d"); + VERIFY("bool[0]", in_bool[0], out_bool[0], "%d"); + VERIFY("bool[1]", in_bool[1], out_bool[1], "%d"); + VERIFY("bool[2]", in_bool[2], out_bool[2], "%d"); VERIFY_STR("str2", in_str2, out_str2, "%s"); ret = 0; @@ -329,6 +335,7 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) int in_int32[] = { 100000000, 2000000000, -2000000000 }; + bool in_bool[] = { true, false, true }; const char *in_strv1[] = { "Fishfood", }; @@ -337,6 +344,8 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) }; int *out_int32 = NULL; size_t out_nint32 = 0; + bool *out_bool = NULL; + size_t out_nbool = 0; char **out_strv1 = NULL; char **out_strv2 = NULL; size_t out_nstrv1 = 0; @@ -354,10 +363,11 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) } if (virDBusMessageEncode(msg, - "sa&sa&ia&ss", + "sa&sa&ia&ba&ss", in_str1, 1, in_strv1, 3, in_int32, + 3, in_bool, 2, in_strv2, in_str2) < 0) { VIR_DEBUG("Failed to encode arguments"); @@ -365,10 +375,11 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) } if (virDBusMessageDecode(msg, - "sa&sa&ia&ss", + "sa&sa&ia&ba&ss", &out_str1, &out_nstrv1, &out_strv1, &out_nint32, &out_int32, + &out_nbool, &out_bool, &out_nstrv2, &out_strv2, &out_str2) < 0) { VIR_DEBUG("Failed to decode arguments"); @@ -393,6 +404,15 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) VERIFY("int32b", in_int32[1], out_int32[1], "%d"); VERIFY("int32c", in_int32[2], out_int32[2], "%d"); + if (out_nbool != 3) { + fprintf(stderr, "Expected 3 bools, but got %zu\n", + out_nbool); + goto cleanup; + } + VERIFY("bool[0]", in_bool[0], out_bool[0], "%d"); + VERIFY("bool[1]", in_bool[1], out_bool[1], "%d"); + VERIFY("bool[2]", in_bool[2], out_bool[2], "%d"); + if (out_nstrv2 != 2) { fprintf(stderr, "Expected 2 strings, but got %zu\n", out_nstrv2); @@ -407,6 +427,7 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) cleanup: VIR_FREE(out_int32); + VIR_FREE(out_bool); VIR_FREE(out_str1); VIR_FREE(out_str2); for (i = 0; i < out_nstrv1; i++) -- 1.9.3

1 1

[libvirt] [PATCH] Re-add use of locking with iptables/ip6tables/ebtables
by Daniel P. Berrange 25 Nov '14

25 Nov '14

A previous commit introduced use of locking with invocation of iptables in the viriptables.c module commit ba95426d6f39aec1da6e069dd7222f7a8c6a5862 Author: Serge Hallyn <serge.hallyn(a)ubuntu.com> Date: Fri Nov 1 12:36:59 2013 -0500 util: use -w flag when calling iptables This only ever had effect with the virtual network driver, as it was not wired up into the nwfilter driver. Unfortunately in the firewall refactoring the use of the -w flag was accidentally lost. This patch introduces it to the virfirewall.c module so that both the virtual network and nwfilter drivers will be using it. It also ensures that the equivalent --concurrent flag to ebtables is used. --- src/util/virfirewall.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++--- src/util/viriptables.c | 2 -- 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index bab1634..c83fdc6 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -104,6 +104,44 @@ virFirewallOnceInit(void) VIR_ONCE_GLOBAL_INIT(virFirewall) +static bool iptablesUseLock; +static bool ip6tablesUseLock; +static bool ebtablesUseLock; + +static void +virFirewallCheckUpdateLock(bool *lockflag, + const char *const*args) +{ + virCommandPtr cmd = virCommandNewArgs(args); + if (virCommandRun(cmd, NULL) < 0) { + VIR_INFO("locking not supported by %s", args[0]); + } else { + VIR_INFO("using locking for %s", args[0]); + *lockflag = true; + } + virCommandFree(cmd); +} + +static void +virFirewallCheckUpdateLocking(void) +{ + const char *iptablesArgs[] = { + IPTABLES_PATH, "-w", "-L", "-n", NULL, + }; + const char *ip6tablesArgs[] = { + IP6TABLES_PATH, "-w", "-L", "-n", NULL, + }; + const char *ebtablesArgs[] = { + EBTABLES_PATH, "--concurrent", "-L", NULL, + }; + virFirewallCheckUpdateLock(&iptablesUseLock, + iptablesArgs); + virFirewallCheckUpdateLock(&ip6tablesUseLock, + ip6tablesArgs); + virFirewallCheckUpdateLock(&ebtablesUseLock, + ebtablesArgs); +} + static int virFirewallValidateBackend(virFirewallBackend backend) { @@ -161,6 +199,9 @@ virFirewallValidateBackend(virFirewallBackend backend) } currentBackend = backend; + + virFirewallCheckUpdateLocking(); + return 0; } @@ -201,6 +242,9 @@ virFirewallPtr virFirewallNew(void) { virFirewallPtr firewall; + if (virFirewallInitialize() < 0) + return NULL; + if (VIR_ALLOC(firewall) < 0) return NULL; @@ -321,6 +365,23 @@ virFirewallAddRuleFullV(virFirewallPtr firewall, rule->queryOpaque = opaque; rule->ignoreErrors = ignoreErrors; + switch (rule->layer) { + case VIR_FIREWALL_LAYER_ETHERNET: + if (ebtablesUseLock) + ADD_ARG(rule, "--concurrent"); + break; + case VIR_FIREWALL_LAYER_IPV4: + if (iptablesUseLock) + ADD_ARG(rule, "-w"); + break; + case VIR_FIREWALL_LAYER_IPV6: + if (ip6tablesUseLock) + ADD_ARG(rule, "-w"); + break; + case VIR_FIREWALL_LAYER_LAST: + break; + } + while ((str = va_arg(args, char *)) != NULL) { ADD_ARG(rule, str); } @@ -840,8 +901,8 @@ virFirewallApplyGroup(virFirewallPtr firewall, bool ignoreErrors = (group->actionFlags & VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS); size_t i; - VIR_INFO("Starting transaction for %p flags=%x", - group, group->actionFlags); + VIR_INFO("Starting transaction for firewall=%p group=%p flags=%x", + firewall, group, group->actionFlags); firewall->currentGroup = idx; group->addingRollback = false; for (i = 0; i < group->naction; i++) { @@ -879,8 +940,6 @@ virFirewallApply(virFirewallPtr firewall) int ret = -1; virMutexLock(&ruleLock); - if (virFirewallInitialize() < 0) - goto cleanup; if (!firewall || firewall->err == ENOMEM) { virReportOOMError(); diff --git a/src/util/viriptables.c b/src/util/viriptables.c index 4f3ac9c..46b4017 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -52,8 +52,6 @@ VIR_LOG_INIT("util.iptables"); -bool iptables_supports_xlock = false; - #define VIR_FROM_THIS VIR_FROM_NONE enum { -- 2.1.0

5 6

[libvirt] [PATCH 0/9] Let libvirt manage a bridge's FDB
by Laine Stump 25 Nov '14

25 Nov '14

The idea behind these patches is the following: 1) most virtual machines only have a single MAC address behind each interface, and that MAC address is known by libvirt. 2) If we (i.e. libvirt) manually add an entry to the bridge's forwarding database (fdb) for the MAC address associated with a port on the bridge, we can turn off learning and unicast_flooding for that port. 3) kernels starting with 3.15 (and actually working correctly starting in kernel 3.17) will notice that all of a bridge's ports have flood and learning turned off, and in that case will turn off promiscuous mode on all ports. If all but one of the ports have flood/learning turned off, then promiscuous will be turned off on that port (and left on for all the other ports) 4) When (4) can be done, there is a measurable performance advantage. It can also help security, as it will prevent a guest from doing anything useful if it changes its MAC address. Notes: A) Patches 1-7 are the only ones that I plan to push now, 8 & 9 are just to simplify tangentially-related code, and I've found a problem with these during update of a live system, so I won't be pushing them. You can/should ignore them for now. B) I don't like the name "promiscLinks", and will probably change it (maybe to "fdb='managed|auto'), but want to get the other aspects of these patches reviewed. C) These only work with a fixed MAC address, and no vlan tags set in the guest. Support for both of those will be coming. Laine Stump (9): util: new functions for setting bridge and bridge port attributes util: functions to manage bridge fdb (forwarding database) conf: new network bridge device attribute promiscLinks network: save bridge name in ActualNetDef when actualType==network too network: store network promiscLinks setting in NetDef actual object network: setup bridge devices for promiscLinks='no' qemu: setup tap devices for promiscLinks='no' qemu: always use virDomainNetGetActualBridgeName to get interface's bridge lxc: always use virDomainNetGetActualBridgeName to get interface's bridge docs/formatnetwork.html.in | 36 +- docs/schemas/network.rng | 5 + src/conf/domain_conf.c | 129 +++++--- src/conf/domain_conf.h | 2 + src/conf/network_conf.c | 47 ++- src/conf/network_conf.h | 1 + src/libvirt_private.syms | 9 + src/lxc/lxc_driver.c | 32 +- src/lxc/lxc_process.c | 32 +- src/network/bridge_driver.c | 66 ++++ src/qemu/qemu_command.c | 51 ++- src/qemu/qemu_hotplug.c | 60 +--- src/util/virnetdevbridge.c | 364 ++++++++++++++++++++- src/util/virnetdevbridge.h | 44 ++- tests/networkxml2xmlin/host-bridge-no-flood.xml | 6 + .../nat-network-explicit-flood.xml | 21 ++ tests/networkxml2xmlout/host-bridge-no-flood.xml | 6 + .../nat-network-explicit-flood.xml | 23 ++ tests/networkxml2xmltest.c | 2 + 19 files changed, 726 insertions(+), 210 deletions(-) create mode 100644 tests/networkxml2xmlin/host-bridge-no-flood.xml create mode 100644 tests/networkxml2xmlin/nat-network-explicit-flood.xml create mode 100644 tests/networkxml2xmlout/host-bridge-no-flood.xml create mode 100644 tests/networkxml2xmlout/nat-network-explicit-flood.xml -- 1.9.3

3 20

[libvirt] [PATCH] qemu: add the missing jobinfo type in qemuDomainGetJobInfo
by Wang Rui 25 Nov '14

25 Nov '14

Commit 6fcddfcd refactored job statistics but missed the jobinfo type updated in qemuDomainGetJobInfo. After this patch, we can use virDomainGetJobInfo to get jobinfo type again. Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- src/qemu/qemu_domain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 334bd40..6513c78 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -258,6 +258,7 @@ int qemuDomainJobInfoToInfo(qemuDomainJobInfoPtr jobInfo, virDomainJobInfoPtr info) { + info->type = jobInfo->type; info->timeElapsed = jobInfo->timeElapsed; info->timeRemaining = jobInfo->timeRemaining; -- 1.7.12.4

2 1

[libvirt] [PATCH] automatic create tap device with network type ethernet
by Vasiliy Tolstov 25 Nov '14

25 Nov '14

If use not specify script in network type ethernet, assume that user needs simple tap device created with libvirt. This patch does not need to run external script to create tap device. Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- src/qemu/qemu_command.c | 88 ++++++++++++++++++++++++++++++++----------------- src/qemu/qemu_hotplug.c | 10 ++---- src/qemu/qemu_process.c | 4 +++ 3 files changed, 64 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cbdef9c..5f9833e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -319,7 +319,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, } else if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { if (VIR_STRDUP(brname, virDomainNetGetActualBridgeName(net)) < 0) return ret; - } else { + } else if (actualType != VIR_DOMAIN_NET_TYPE_ETHERNET) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Network type %d is not supported"), virDomainNetGetActualType(net)); @@ -341,30 +341,42 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, tap_create_flags |= VIR_NETDEV_TAP_CREATE_VNET_HDR; } - if (cfg->privileged) { - if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, - def->uuid, tunpath, tapfd, *tapfdSize, - virDomainNetGetActualVirtPortProfile(net), - virDomainNetGetActualVlan(net), - tap_create_flags) < 0) { + if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { + if (virNetDevTapCreate(&net->ifname, tunpath, tapfd, *tapfdSize, + tap_create_flags) < 0) { virDomainAuditNetDevice(def, net, tunpath, false); goto cleanup; } - } else { - if (qemuCreateInBridgePortWithHelper(cfg, brname, - &net->ifname, - tapfd, tap_create_flags) < 0) { - virDomainAuditNetDevice(def, net, tunpath, false); + if (virNetDevSetMAC(net->ifname, &net->mac) < 0) goto cleanup; + if (virNetDevSetOnline(net->ifname, !!(tap_create_flags & VIR_NETDEV_TAP_CREATE_IFUP)) < 0) + goto cleanup; + } else { + if (cfg->privileged) { + if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, + def->uuid, tunpath, tapfd, *tapfdSize, + virDomainNetGetActualVirtPortProfile(net), + virDomainNetGetActualVlan(net), + tap_create_flags) < 0) { + virDomainAuditNetDevice(def, net, tunpath, false); + goto cleanup; + } + } else { + if (qemuCreateInBridgePortWithHelper(cfg, brname, + &net->ifname, + tapfd, tap_create_flags) < 0) { + virDomainAuditNetDevice(def, net, tunpath, false); + goto cleanup; + } + /* qemuCreateInBridgePortWithHelper can only create a single FD */ + if (*tapfdSize > 1) { + VIR_WARN("Ignoring multiqueue network request"); + *tapfdSize = 1; + } } - /* qemuCreateInBridgePortWithHelper can only create a single FD */ - if (*tapfdSize > 1) { - VIR_WARN("Ignoring multiqueue network request"); - *tapfdSize = 1; - } - } - virDomainAuditNetDevice(def, net, tunpath, true); + virDomainAuditNetDevice(def, net, tunpath, true); + } if (cfg->macFilter && ebtablesAddForwardAllowIn(driver->ebtables, @@ -4540,18 +4552,32 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_ETHERNET: - virBufferAddLit(&buf, "tap"); + virBufferAddLit(&buf, "tap"); + type_sep = ','; + if (net->script) { if (net->ifname) { - virBufferAsprintf(&buf, "%cifname=%s", type_sep, net->ifname); - type_sep = ','; + virBufferAsprintf(&buf, "%cifname=%s", type_sep, net->ifname); + type_sep = ','; } - if (net->script) { - virBufferAsprintf(&buf, "%cscript=%s", type_sep, - net->script); - type_sep = ','; + virBufferAsprintf(&buf, "%cscript=%s", type_sep, net->script); + type_sep = ','; + } else { + /* for one tapfd 'fd=' shall be used, + * for more than one 'fds=' is the right choice */ + if (tapfdSize == 1) { + virBufferAsprintf(&buf, "%cfd=%s", type_sep, tapfd[0]); + } else { + virBufferAsprintf(&buf, "%cfds=", type_sep); + for (i = 0; i < tapfdSize; i++) { + if (i) + virBufferAddChar(&buf, ':'); + virBufferAdd(&buf, tapfd[i], -1); + } } - is_tap = true; - break; + type_sep = ','; + } + is_tap = true; + break; case VIR_DOMAIN_NET_TYPE_CLIENT: virBufferAsprintf(&buf, "socket%cconnect=%s:%d", @@ -7348,7 +7374,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -7356,7 +7383,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, } if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { tapfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = 1; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b00fd8f..bf92e4d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -908,7 +908,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, } if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || - actualType == VIR_DOMAIN_NET_TYPE_NETWORK) { + actualType == VIR_DOMAIN_NET_TYPE_NETWORK || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { tapfdSize = vhostfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = vhostfdSize = 1; @@ -939,13 +940,6 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, iface_connected = true; if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) goto cleanup; - } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { - vhostfdSize = 1; - if (VIR_ALLOC(vhostfd) < 0) - goto cleanup; - *vhostfd = -1; - if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) - goto cleanup; } /* Set Bandwidth */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c3ee40b..8bc4d81 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5085,6 +5085,10 @@ void qemuProcessStop(virQEMUDriverPtr driver, cfg->stateDir)); VIR_FREE(net->ifname); break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: + ignore_value(virNetDevTapDelete(net->ifname, net->backend.tap)); + VIR_FREE(net->ifname); + break; case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: #ifdef VIR_NETDEV_TAP_REQUIRE_MANUAL_CLEANUP -- 2.1.3

1 1

[libvirt] Build failed in Jenkins: libvirt-syntax-check #2942
by Jenkins CI 25 Nov '14

25 Nov '14

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/2942/> ------------------------------------------ Started by upstream project "libvirt-build" build number 3319 Building on master in workspace <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ws/> [workspace] $ /bin/sh -xe /tmp/hudson1736521433734130077.sh + make syntax-check GEN bracket-spacing-check Invalid character after comma: src/security/virt-aa-helper.c:574: "/sys/devices/pci", /* for hostdev pci devices */ maint.mk: incorrect formatting, see HACKING for rules make: *** [bracket-spacing-check] Error 1 Build step 'Execute shell' marked build as failure

1 1

[libvirt] [PATCH] Resolve build breaker
by John Ferlan 25 Nov '14

25 Nov '14

Commit 'c264eeaa' didn't do the prerequisite 'make syntax-check' before pushing. There was a <tab> in the whitespace for the comment. Replaced with spaces and aligned. pushed as build breaker since Jenkins complained loudly Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/security/virt-aa-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index f273e09..869bf18 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -571,7 +571,7 @@ valid_path(const char *path, const bool readonly) }; /* override the above with these */ const char * const override[] = { - "/sys/devices/pci", /* for hostdev pci devices */ + "/sys/devices/pci", /* for hostdev pci devices */ "/etc/libvirt-sandbox/services/" /* for virt-sandbox service config */ }; -- 1.9.3

1 0