- Devel - libvirt List Archives

[libvirt] [PATCH] Introduce virConnectCrashDaemon API
by Ján Tomko 01 Apr '14

01 Apr '14

This reduces the affect of an unexpected DoS vulnerablity in libvirtd. --- include/libvirt/libvirt.h.in | 13 +++++++++++++ src/driver.h | 5 +++++ src/libvirt.c | 32 +++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 4 ++++ src/qemu/qemu_driver.c | 16 ++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 15 ++++++++++++++- src/util/virutil.c | 23 ++++++++++++++++++++++ src/util/virutil.h | 1 + tools/virsh-host.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 155 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 930b7e8..d0db483 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1540,6 +1540,19 @@ char * virConnectGetURI (virConnectPtr conn); char * virConnectGetSysinfo (virConnectPtr conn, unsigned int flags); +typedef enum { + VIR_CONNECT_CRASH_RANDOM = 0, /* Randomly choose one crash method */ + VIR_CONNECT_CRASH_NULL_PTR = 1, /* Null pointer access */ + VIR_CONNECT_CRASH_DOUBLE_FREE = 2, /* Double free */ + +# ifdef VIR_ENUM_SENTINELS + VIR_CONNECT_CRASH_LAST +# endif +} virConnectCrashFlags; + +int virConnectCrashDaemon (virConnectPtr conn, + unsigned int flags); + int virConnectSetKeepAlive(virConnectPtr conn, int interval, unsigned int count); diff --git a/src/driver.h b/src/driver.h index e66fc7a..b899a4f 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1149,6 +1149,10 @@ typedef int unsigned int flags, int cancelled); +typedef int +(*virDrvConnectCrashDaemon)(virConnectPtr conn, + unsigned int flags); + typedef struct _virDriver virDriver; typedef virDriver *virDriverPtr; @@ -1363,6 +1367,7 @@ struct _virDriver { virDrvDomainMigrateFinish3Params domainMigrateFinish3Params; virDrvDomainMigrateConfirm3Params domainMigrateConfirm3Params; virDrvConnectGetCPUModelNames connectGetCPUModelNames; + virDrvConnectCrashDaemon connectCrashDaemon; }; diff --git a/src/libvirt.c b/src/libvirt.c index 4454829..739c747 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1717,6 +1717,38 @@ virConnectGetSysinfo(virConnectPtr conn, unsigned int flags) /** + * virConnectCrashDaemon: + * @conn: pointer to a hypervisor connection + * @flags: one of virConnectCrashDaemonFlags + * + * Crashes the daemon by the method selected via @flags. + * + * Returns -1 on error or doesn't return at all in case of success. + */ +int +virConnectCrashDaemon(virConnectPtr conn, unsigned int flags) +{ + VIR_DEBUG("conn=%p, flags=%x", conn, flags); + + virResetLastError(); + + virCheckConnectReturn(conn, -1); + + if (conn->driver->connectCrashDaemon) { + if (conn->driver->connectCrashDaemon(conn, flags) < 0) + goto error; + return 0; + } + + virReportUnsupportedError(); + +error: + virDispatchError(conn); + return -1; +} + + +/** * virConnectGetMaxVcpus: * @conn: pointer to the hypervisor connection * @type: value of the 'type' attribute in the <domain> element diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 38fbf63..18f91b2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1983,6 +1983,7 @@ virUSBDeviceSetUsedBy; # util/virutil.h virCompareLimitUlong; +virCrashDaemon; virDoubleToStr; virEnumFromString; virEnumToString; diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 9ab0c92..378d256 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -650,5 +650,9 @@ LIBVIRT_1.2.3 { virDomainCoreDumpWithFormat; } LIBVIRT_1.2.1; +LIBVIRT_1.2.4 { + global: + virConnectCrashDaemon; +} LIBVIRT_1.2.3; # .... define new API here using predicted next version number .... diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b032441..cd258b7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16661,6 +16661,21 @@ qemuConnectGetCPUModelNames(virConnectPtr conn, } +static int +qemuConnectCrashDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, + unsigned int flags) +{ + if (flags >= VIR_CONNECT_CRASH_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("Unsupported crash method %u"), + flags); + return -1; + } + + return virCrashDaemon(flags); +} + + static virDriver qemuDriver = { .no = VIR_DRV_QEMU, .name = QEMU_DRIVER_NAME, @@ -16851,6 +16866,7 @@ static virDriver qemuDriver = { .domainMigrateFinish3Params = qemuDomainMigrateFinish3Params, /* 1.1.0 */ .domainMigrateConfirm3Params = qemuDomainMigrateConfirm3Params, /* 1.1.0 */ .connectGetCPUModelNames = qemuConnectGetCPUModelNames, /* 1.1.3 */ + .connectCrashDaemon = qemuConnectCrashDaemon, /* 1.2.4 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index ed7dde6..b01dd5b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7800,6 +7800,7 @@ static virDriver remote_driver = { .domainMigrateFinish3Params = remoteDomainMigrateFinish3Params, /* 1.1.0 */ .domainMigrateConfirm3Params = remoteDomainMigrateConfirm3Params, /* 1.1.0 */ .connectGetCPUModelNames = remoteConnectGetCPUModelNames, /* 1.1.3 */ + .connectCrashDaemon = remoteConnectCrashDaemon, /* 1.2.4 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 6c445cc..7eb7f83 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -442,6 +442,13 @@ struct remote_connect_get_sysinfo_ret { remote_nonnull_string sysinfo; }; +struct remote_connect_crash_daemon_args { + unsigned int flags; +}; + +struct remote_connect_crash_daemon_ret { + int retval; +}; struct remote_connect_get_uri_ret { remote_nonnull_string uri; }; @@ -5275,5 +5282,11 @@ enum remote_procedure { * @generate: both * @acl: domain:core_dump */ - REMOTE_PROC_DOMAIN_CORE_DUMP_WITH_FORMAT = 334 + REMOTE_PROC_DOMAIN_CORE_DUMP_WITH_FORMAT = 334, + + /** + * @generate: both + * @acl: none + */ + REMOTE_PROC_CONNECT_CRASH_DAEMON = 335 }; diff --git a/src/util/virutil.c b/src/util/virutil.c index 9be1590..97215d0 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -78,6 +78,7 @@ #include "vircommand.h" #include "nonblocking.h" #include "virprocess.h" +#include "virrandom.h" #include "virstring.h" #include "virutil.h" @@ -2204,3 +2205,25 @@ void virUpdateSelfLastChanged(const char *path) selfLastChanged = sb.st_ctime; } } + +int virCrashDaemon(unsigned int flags) +{ + char **bla = NULL; + char **tmp; + + if (flags == VIR_CONNECT_CRASH_RANDOM) + flags = virRandomInt(VIR_CONNECT_CRASH_LAST) + 1; + + switch (flags) { + case VIR_CONNECT_CRASH_NULL_PTR: + bla[1] = bla[0]; + /* fallthrough */ + case VIR_CONNECT_CRASH_DOUBLE_FREE: + if (VIR_ALLOC_N(bla, 2) < 0) + return -1; + tmp = bla; + VIR_FREE(tmp); + VIR_FREE(bla); + } + return -1; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index 1f2efd5..aaf1bef 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -202,4 +202,5 @@ bool virIsSUID(void); time_t virGetSelfLastChanged(void); void virUpdateSelfLastChanged(const char *path); +int virCrashDaemon(unsigned int flags); #endif /* __VIR_UTIL_H__ */ diff --git a/tools/virsh-host.c b/tools/virsh-host.c index cac6086..28e5e3b 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -939,6 +939,45 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) goto cleanup; } +/* + * "crash" command + */ +static const vshCmdInfo info_crash[] = { + {.name = "help", + .data = N_("crash the daemon") + }, + {.name = "desc", + .data = N_("Crash the libvirt daemon using the selected method.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_crash[] = { + {.name = "null", + .type = VSH_OT_BOOL, + .help = N_("Crash by null pointer access") + }, + {.name = "doublefree", + .type = VSH_OT_BOOL, + .help = N_("Crash by double free") + }, + {.name = NULL} +}; + +static bool +cmdCrash(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +{ + unsigned int flags = VIR_CONNECT_CRASH_RANDOM; + + if (vshCommandOptBool(cmd, "null")) + flags = VIR_CONNECT_CRASH_NULL_PTR; + if (vshCommandOptBool(cmd, "doublefree")) + flags = VIR_CONNECT_CRASH_DOUBLE_FREE; + + virConnectCrashDaemon(ctl->conn, flags); + return true; +} + const vshCmdDef hostAndHypervisorCmds[] = { {.name = "capabilities", .handler = cmdCapabilities, @@ -1024,5 +1063,11 @@ const vshCmdDef hostAndHypervisorCmds[] = { .info = info_version, .flags = 0 }, + {.name = "crash", + .handler = cmdCrash, + .opts = opts_crash, + .info = info_crash, + .flags = 0 + }, {.name = NULL} }; -- 1.8.3.2

3 2

[libvirt] [PATCH] Bump version to 1.2.4 for new dev cycle
by Michal Privoznik 01 Apr '14

01 Apr '14

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed already, just sending a note. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 73efffa..7b9e38a 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.2.3], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.4], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 1.9.0

1 0

[libvirt] [PATCH] build: fix syntax-check for storage_backend
by Martin Kletzander 01 Apr '14

01 Apr '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as a build-breaker. src/storage/storage_backend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 42bd445..adf0311 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1,7 +1,7 @@ /* * storage_backend.c: internal storage driver backend contract * - * Copyright (C) 2007-2013 Red Hat, Inc. + * Copyright (C) 2007-2014 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -1405,7 +1405,7 @@ virStorageBackendUpdateVolTargetInfo(virStorageVolTargetPtr target, goto cleanup; } - cleanup: + cleanup: VIR_FORCE_CLOSE(fd); return ret; -- 1.9.1

1 0

[libvirt] [for-1.2.3 PATCHv3] gluster: Fix "key" attribute for gluster volumes
by Peter Krempa 01 Apr '14

01 Apr '14

According to our documentation the "key" value has the following meaning: "Providing an identifier for the volume which identifies a single volume." The currently used keys for gluster volumes consist of the gluster volume name and file path. This can't be considered unique as a different storage server can serve a volume with the same name. Unfortunately I wasn't able to figure out a way to retrieve the gluster volume UUID which would avoid the possibility of having two distinct keys identifying a single volume. Use the full URI as the key for the volume to avoid the more critical ambiguity problem and document the possible change to UUID. --- Notes: Version 3: - fix the example too, also state that UUID might be used - repost so we don't have yet another release containing this docs/storage.html.in | 8 +++++--- src/storage/storage_backend_gluster.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index 2706bc5..4bbf378 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -711,12 +711,14 @@ correspond to the files that can be found when mounting the gluster volume. The <code>name</code> is the path relative to the effective mount specified for the pool; and - the <code>key</code> is a path including the gluster volume - name and any subdirectory specified by the pool.</p> + the <code>key</code> is a string that identifies a single volume + uniquely. Currently the <code>key</code> attribute consists of the + URI of the volume but it may be changed to an UUID of the volume + in the future.</p> <pre> <volume> <name>myfile</name> - <key>volname/myfile</key> + <key>gluster://localhost/volname/myfile</key> <source> </source> <capacity unit='bytes'>53687091200</capacity> diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index fe92f15..337ddf4 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -187,6 +187,7 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, const char *name) { int ret = -1; + char *path = NULL; char *tmp; VIR_FREE(vol->key); @@ -201,12 +202,12 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, goto cleanup; } - if (virAsprintf(&vol->key, "%s%s%s", state->volname, state->dir, + if (virAsprintf(&path, "%s%s%s", state->volname, state->dir, vol->name) < 0) goto cleanup; tmp = state->uri->path; - if (virAsprintf(&state->uri->path, "/%s", vol->key) < 0) { + if (virAsprintf(&state->uri->path, "/%s", path) < 0) { state->uri->path = tmp; goto cleanup; } @@ -218,9 +219,14 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, VIR_FREE(state->uri->path); state->uri->path = tmp; + /* the path is unique enough to serve as a volume key */ + if (VIR_STRDUP(vol->key, vol->target.path) < 0) + goto cleanup; + ret = 0; cleanup: + VIR_FREE(path); return ret; } -- 1.9.1

2 2

[libvirt] [PATCH] Fix Memory Leak in testMessageArrayRef()
by Nehal J Wani 01 Apr '14

01 Apr '14

While running virdbustest, it was found that valgrind pointed out the following memory leaks: ==9996== 17 (8 direct, 9 indirect) bytes in 1 blocks are definitely lost in loss record 9 of 36 ==9996== at 0x4A069EE: malloc (vg_replace_malloc.c:270) ==9996== by 0x4A06B62: realloc (vg_replace_malloc.c:662) ==9996== by 0x4C6B587: virReallocN (viralloc.c:245) ==9996== by 0x4C6B6AE: virExpandN (viralloc.c:294) ==9996== by 0x4C82B54: virDBusMessageDecodeArgs (virdbus.c:907) ==9996== by 0x4C83463: virDBusMessageDecode (virdbus.c:1141) ==9996== by 0x402C45: testMessageArrayRef (virdbustest.c:273) ==9996== by 0x404E71: virtTestRun (testutils.c:201) ==9996== by 0x401C2D: mymain (virdbustest.c:479) ==9996== by 0x4055ED: virtTestMain (testutils.c:789) ==9996== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==9996== ==9996== 28 (16 direct, 12 indirect) bytes in 1 blocks are definitely lost in loss record 12 of 36 ==9996== at 0x4A06BE0: realloc (vg_replace_malloc.c:662) ==9996== by 0x4C6B587: virReallocN (viralloc.c:245) ==9996== by 0x4C6B6AE: virExpandN (viralloc.c:294) ==9996== by 0x4C82B54: virDBusMessageDecodeArgs (virdbus.c:907) ==9996== by 0x4C83463: virDBusMessageDecode (virdbus.c:1141) ==9996== by 0x402C45: testMessageArrayRef (virdbustest.c:273) ==9996== by 0x404E71: virtTestRun (testutils.c:201) ==9996== by 0x401C2D: mymain (virdbustest.c:479) ==9996== by 0x4055ED: virtTestMain (testutils.c:789) ==9996== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==9996== --- tests/virdbustest.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tests/virdbustest.c b/tests/virdbustest.c index 1870f35..bdb1c24 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -250,6 +250,7 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) size_t out_nstrv2 = 0; const char *in_str2 = "World"; char *out_str1 = NULL, *out_str2 = NULL; + size_t i = 0; if (!(msg = dbus_message_new_method_call("org.libvirt.test", "/org/libvirt/test", @@ -315,6 +316,12 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) VIR_FREE(out_int32); VIR_FREE(out_str1); VIR_FREE(out_str2); + for (i = 0; i < out_nstrv1; i++) + VIR_FREE(out_strv1[i]); + VIR_FREE(out_strv1); + for (i = 0; i < out_nstrv2; i++) + VIR_FREE(out_strv2[i]); + VIR_FREE(out_strv2); dbus_message_unref(msg); return ret; } -- 1.7.1

2 1

[libvirt] [PATCH 0/4] storage: Fix VolOpen error reporting
by Cole Robinson 01 Apr '14

01 Apr '14

In https://bugzilla.redhat.com/show_bug.cgi?id=1080613 , something is causing StorageVolGetXML to fail, but it's not raising any error message. Code inspection found that most users of VolOpen are susceptible to error reporting issues. The first 3 patches are some code reorganization and cleanups that make it easier to identify the VolOpen callers. Patch 4 fixes up the reporting issue. Cole Robinson (4): storage: Rename UpdateVolInfoFlags to UpdateVolInfo storage: move block format lookup to shared UpdateVolInfo storage: Rename VolOpenCheckMode to VolOpen storage: Always report an error from VolOpen src/storage/storage_backend.c | 234 +++++++++++++++++----------------- src/storage/storage_backend.h | 18 +-- src/storage/storage_backend_disk.c | 3 +- src/storage/storage_backend_fs.c | 28 ++-- src/storage/storage_backend_logical.c | 11 +- src/storage/storage_backend_mpath.c | 36 +----- src/storage/storage_backend_scsi.c | 43 +------ 7 files changed, 159 insertions(+), 214 deletions(-) -- 1.8.5.3

3 7

[libvirt] [PATCH tck 0/6] Fix tests which need a full OS image
by Daniel P. Berrange 01 Apr '14

01 Apr '14

A bunch of tests currently attempt to kickstart a full Fedora OS image install. Everytime I try to update this kickstart to a new version of Fedora it causes no end of pain. Switch the tests over to use Richard Jones' virt-builder command which is part of libguestfs. This makes it trivial to deploy and customize full OS images from pre-built templates. Mike - does Suse include a new enough version of libguestfs to get access to the 'virt-builder' tool yet ? Daniel P. Berrange (6): Add ability to provision full OS using virt-builder Fix path to dnsmasq leases file Add ability to setup NIC when creating guest XML Force destroy guests if graceful shutdown fails Convert nwfilter and domain balloon tests to virtbuilder images Remove obsolete kickstart provisioning helper methods Build.PL | 1 - conf/default.cfg | 25 +++ conf/ks.cfg | 30 ---- lib/Sys/Virt/TCK.pm | 280 +++++++++++++++++++++++++----- lib/Sys/Virt/TCK/DomainBuilder.pm | 20 ++- lib/Sys/Virt/TCK/NetworkHelpers.pm | 140 +-------------- perl-Sys-Virt-TCK.spec.PL | 1 - scripts/domain/110-memory-balloon.t | 10 +- scripts/nwfilter/090-install-image.t | 55 ------ scripts/nwfilter/100-ping-still-working.t | 54 +++--- scripts/nwfilter/210-no-mac-spoofing.t | 81 +++++---- scripts/nwfilter/220-no-ip-spoofing.t | 78 +++++---- scripts/nwfilter/230-no-mac-broadcast.t | 53 +++--- scripts/nwfilter/240-no-arp-spoofing.t | 60 ++++--- scripts/nwfilter/300-vsitype.t | 40 +++-- scripts/nwfilter/nwfilter_concurrent.sh | 4 +- 16 files changed, 493 insertions(+), 439 deletions(-) delete mode 100644 conf/ks.cfg delete mode 100644 scripts/nwfilter/090-install-image.t -- 1.8.5.3

4 24

[libvirt] [PATCH tck] Find ebtables in /sbin or /usr/sbin
by Mike Latimer 01 Apr '14

01 Apr '14

If ebtables binary is not found in /sbin, use /usr/sbin. --- scripts/nwfilter/100-ping-still-working.t | 3 ++- scripts/nwfilter/210-no-mac-spoofing.t | 3 ++- scripts/nwfilter/220-no-ip-spoofing.t | 3 ++- scripts/nwfilter/230-no-mac-broadcast.t | 3 ++- scripts/nwfilter/240-no-arp-spoofing.t | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/nwfilter/100-ping-still-working.t b/scripts/nwfilter/100-ping-still-working.t index 0bfdc00..1105d70 100644 --- a/scripts/nwfilter/100-ping-still-working.t +++ b/scripts/nwfilter/100-ping-still-working.t @@ -64,7 +64,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # fixme to include mac adress ok($ebtable =~ "vnet0", "check ebtables entry"); diff --git a/scripts/nwfilter/210-no-mac-spoofing.t b/scripts/nwfilter/210-no-mac-spoofing.t index fb20351..d7c57e6 100644 --- a/scripts/nwfilter/210-no-mac-spoofing.t +++ b/scripts/nwfilter/210-no-mac-spoofing.t @@ -64,7 +64,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # ebtables shortens :00: to :0: so we need to do that too $_ = $mac; diff --git a/scripts/nwfilter/220-no-ip-spoofing.t b/scripts/nwfilter/220-no-ip-spoofing.t index 063bb5b..5e8e0d7 100644 --- a/scripts/nwfilter/220-no-ip-spoofing.t +++ b/scripts/nwfilter/220-no-ip-spoofing.t @@ -64,7 +64,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # check if IP address is listed ok($ebtable =~ "$guestip", "check ebtables entry"); diff --git a/scripts/nwfilter/230-no-mac-broadcast.t b/scripts/nwfilter/230-no-mac-broadcast.t index 09a758b..a7d3b8e 100644 --- a/scripts/nwfilter/230-no-mac-broadcast.t +++ b/scripts/nwfilter/230-no-mac-broadcast.t @@ -63,7 +63,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # ebtables shortens :00: to :0: so we need to do that too $_ = $mac; diff --git a/scripts/nwfilter/240-no-arp-spoofing.t b/scripts/nwfilter/240-no-arp-spoofing.t index c31ea48..596a0ce 100644 --- a/scripts/nwfilter/240-no-arp-spoofing.t +++ b/scripts/nwfilter/240-no-arp-spoofing.t @@ -65,7 +65,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # check if IP address is listed ok($ebtable =~ "$guestip", "check ebtables entry"); -- 1.8.4.5

2 2

[libvirt] [PATCH tck] 100-ping-still-working.t: Replace vnet0 with mac address
by Mike Latimer 01 Apr '14

01 Apr '14

Using a statically defined vnet0 may fail if multiple VMs are running on the test machine. Switch to mac address, but replace '00' with '0' to match the output of ebtables. --- scripts/nwfilter/100-ping-still-working.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nwfilter/100-ping-still-working.t b/scripts/nwfilter/100-ping-still-working.t index 1105d70..6c931ff 100644 --- a/scripts/nwfilter/100-ping-still-working.t +++ b/scripts/nwfilter/100-ping-still-working.t @@ -67,8 +67,8 @@ diag "ip is $guestip"; my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; -# fixme to include mac adress -ok($ebtable =~ "vnet0", "check ebtables entry"); +$mac =~ s/00/0/g; +ok($ebtable =~ "$mac", "check ebtables entry"); # ping guest1 my $ping = `ping -c 10 $guestip`; -- 1.8.4.5

1 1

[libvirt] guest band width setting
by Pradeep Kiruvale 01 Apr '14

01 Apr '14

Hi All, I am new to QEMU/libvirt I was starting to learn the libvirt code,I was browsing the code how the guest network bandwidth to be set like we mention <inbound> <outbound> tags in the xml,but where in code exactly these values set to the guest interface. I browsed the code a lot could not find it.Please help to understand how this works. Thanks in advance Pradeep

2 2