- Devel - libvirt List Archives

[libvirt] [PATCH] doc: Fix copy-paste-error in virNodeGetMemoryStats
by Philipp Hahn 22 Jul '13

22 Jul '13

The description seems to be copied from virNodeGetCpuState. Change wrong 'cpu' to 'memory'. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/libvirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt.c b/src/libvirt.c index bc1694a..12f9c41 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -7521,7 +7521,7 @@ error: * @flags: extra flags; not used yet, so callers should always pass 0 * * This function provides memory stats of the node. - * If you want to get total cpu statistics of the node, you must specify + * If you want to get total memory statistics of the node, you must specify * VIR_NODE_MEMORY_STATS_ALL_CELLS to @cellNum. * The @params array will be filled with the values equal to the number of * stats suggested by @nparams -- 1.7.10.4

2 1

[libvirt] [PATCH] bridge driver: s/network_driver/virNetworkDriverState/
by Roman Bogorodskiy 22 Jul '13

22 Jul '13

This is another cleanup before extracting platform-specific parts from bridge_driver. Rename struct network_driver to _virNetworkDriverState and add appropriate typedefs: virNetworkDriverState and virNetworkDriverStatePtr. This will help us to avoid potential problems when moving this struct to the .h file. --- src/network/bridge_driver.c | 110 ++++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a7ff602..8b50659 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -70,7 +70,7 @@ #define VIR_FROM_THIS VIR_FROM_NETWORK /* Main driver state */ -struct network_driver { +struct _virNetworkDriverState { virMutex lock; virNetworkObjList networks; @@ -84,45 +84,47 @@ struct network_driver { dnsmasqCapsPtr dnsmasqCaps; }; +typedef struct _virNetworkDriverState virNetworkDriverState; +typedef virNetworkDriverState *virNetworkDriverStatePtr; -static void networkDriverLock(struct network_driver *driver) +static void networkDriverLock(virNetworkDriverStatePtr driver) { virMutexLock(&driver->lock); } -static void networkDriverUnlock(struct network_driver *driver) +static void networkDriverUnlock(virNetworkDriverStatePtr driver) { virMutexUnlock(&driver->lock); } static int networkStateCleanup(void); -static int networkStartNetwork(struct network_driver *driver, +static int networkStartNetwork(virNetworkDriverStatePtr driver, virNetworkObjPtr network); -static int networkShutdownNetwork(struct network_driver *driver, +static int networkShutdownNetwork(virNetworkDriverStatePtr driver, virNetworkObjPtr network); -static int networkStartNetworkVirtual(struct network_driver *driver, +static int networkStartNetworkVirtual(virNetworkDriverStatePtr driver, virNetworkObjPtr network); -static int networkShutdownNetworkVirtual(struct network_driver *driver, +static int networkShutdownNetworkVirtual(virNetworkDriverStatePtr driver, virNetworkObjPtr network); -static int networkStartNetworkExternal(struct network_driver *driver, +static int networkStartNetworkExternal(virNetworkDriverStatePtr driver, virNetworkObjPtr network); -static int networkShutdownNetworkExternal(struct network_driver *driver, +static int networkShutdownNetworkExternal(virNetworkDriverStatePtr driver, virNetworkObjPtr network); -static void networkReloadIptablesRules(struct network_driver *driver); -static void networkRefreshDaemons(struct network_driver *driver); +static void networkReloadIptablesRules(virNetworkDriverStatePtr driver); +static void networkRefreshDaemons(virNetworkDriverStatePtr driver); static int networkPlugBandwidth(virNetworkObjPtr net, virDomainNetDefPtr iface); static int networkUnplugBandwidth(virNetworkObjPtr net, virDomainNetDefPtr iface); -static struct network_driver *driverState = NULL; +static virNetworkDriverStatePtr driverState = NULL; static char * networkDnsmasqLeaseFileNameDefault(const char *netname) @@ -169,7 +171,7 @@ networkRadvdConfigFileName(const char *netname) /* do needed cleanup steps and remove the network from the list */ static int -networkRemoveInactive(struct network_driver *driver, +networkRemoveInactive(virNetworkDriverStatePtr driver, virNetworkObjPtr net) { char *leasefile = NULL; @@ -256,7 +258,7 @@ networkBridgeDummyNicName(const char *brname) } static void -networkFindActiveConfigs(struct network_driver *driver) +networkFindActiveConfigs(virNetworkDriverStatePtr driver) { size_t i; @@ -308,7 +310,7 @@ networkFindActiveConfigs(struct network_driver *driver) static void -networkAutostartConfigs(struct network_driver *driver) { +networkAutostartConfigs(virNetworkDriverStatePtr driver) { size_t i; for (i = 0; i < driver->networks.count; i++) { @@ -327,7 +329,7 @@ networkAutostartConfigs(struct network_driver *driver) { static DBusHandlerResult firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data) { - struct network_driver *_driverState = user_data; + virNetworkDriverStatePtr _driverState = user_data; if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") || @@ -1025,7 +1027,7 @@ cleanup: } static int -networkStartDhcpDaemon(struct network_driver *driver, +networkStartDhcpDaemon(virNetworkDriverStatePtr driver, virNetworkObjPtr network) { virCommandPtr cmd = NULL; @@ -1112,7 +1114,7 @@ cleanup: * Returns 0 on success, -1 on failure. */ static int -networkRefreshDhcpDaemon(struct network_driver *driver, +networkRefreshDhcpDaemon(virNetworkDriverStatePtr driver, virNetworkObjPtr network) { int ret = -1; @@ -1180,7 +1182,7 @@ cleanup: * Returns 0 on success, -1 on failure. */ static int -networkRestartDhcpDaemon(struct network_driver *driver, +networkRestartDhcpDaemon(virNetworkDriverStatePtr driver, virNetworkObjPtr network) { /* if there is a running dnsmasq, kill it */ @@ -1324,7 +1326,7 @@ cleanup: } static int -networkStartRadvd(struct network_driver *driver ATTRIBUTE_UNUSED, +networkStartRadvd(virNetworkDriverStatePtr driver ATTRIBUTE_UNUSED, virNetworkObjPtr network) { char *pidfile = NULL; @@ -1410,7 +1412,7 @@ cleanup: } static int -networkRefreshRadvd(struct network_driver *driver ATTRIBUTE_UNUSED, +networkRefreshRadvd(virNetworkDriverStatePtr driver ATTRIBUTE_UNUSED, virNetworkObjPtr network) { char *radvdpidbase; @@ -1449,7 +1451,7 @@ networkRefreshRadvd(struct network_driver *driver ATTRIBUTE_UNUSED, #if 0 /* currently unused, so it causes a build error unless we #if it out */ static int -networkRestartRadvd(struct network_driver *driver, +networkRestartRadvd(virNetworkDriverStatePtr driver, virNetworkObjPtr network) { char *radvdpidbase; @@ -1478,7 +1480,7 @@ networkRestartRadvd(struct network_driver *driver, * This should be called when libvirtd is restarted. */ static void -networkRefreshDaemons(struct network_driver *driver) +networkRefreshDaemons(virNetworkDriverStatePtr driver) { size_t i; @@ -2097,7 +2099,7 @@ networkRemoveIptablesRules(virNetworkObjPtr network) } static void -networkReloadIptablesRules(struct network_driver *driver) +networkReloadIptablesRules(virNetworkDriverStatePtr driver) { size_t i; @@ -2373,7 +2375,7 @@ networkAddRouteToBridge(virNetworkObjPtr network, } static int -networkStartNetworkVirtual(struct network_driver *driver, +networkStartNetworkVirtual(virNetworkDriverStatePtr driver, virNetworkObjPtr network) { size_t i; @@ -2552,7 +2554,7 @@ networkStartNetworkVirtual(struct network_driver *driver, return -1; } -static int networkShutdownNetworkVirtual(struct network_driver *driver ATTRIBUTE_UNUSED, +static int networkShutdownNetworkVirtual(virNetworkDriverStatePtr driver ATTRIBUTE_UNUSED, virNetworkObjPtr network) { virNetDevBandwidthClear(network->def->bridge); @@ -2600,7 +2602,7 @@ static int networkShutdownNetworkVirtual(struct network_driver *driver ATTRIBUTE } static int -networkStartNetworkExternal(struct network_driver *driver ATTRIBUTE_UNUSED, +networkStartNetworkExternal(virNetworkDriverStatePtr driver ATTRIBUTE_UNUSED, virNetworkObjPtr network ATTRIBUTE_UNUSED) { /* put anything here that needs to be done each time a network of @@ -2611,7 +2613,7 @@ networkStartNetworkExternal(struct network_driver *driver ATTRIBUTE_UNUSED, return 0; } -static int networkShutdownNetworkExternal(struct network_driver *driver ATTRIBUTE_UNUSED, +static int networkShutdownNetworkExternal(virNetworkDriverStatePtr driver ATTRIBUTE_UNUSED, virNetworkObjPtr network ATTRIBUTE_UNUSED) { /* put anything here that needs to be done each time a network of @@ -2623,7 +2625,7 @@ static int networkShutdownNetworkExternal(struct network_driver *driver ATTRIBUT } static int -networkStartNetwork(struct network_driver *driver, +networkStartNetwork(virNetworkDriverStatePtr driver, virNetworkObjPtr network) { int ret = 0; @@ -2682,7 +2684,7 @@ error: return ret; } -static int networkShutdownNetwork(struct network_driver *driver, +static int networkShutdownNetwork(virNetworkDriverStatePtr driver, virNetworkObjPtr network) { int ret = 0; @@ -2726,7 +2728,7 @@ static int networkShutdownNetwork(struct network_driver *driver, static virNetworkPtr networkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { - struct network_driver *driver = conn->networkPrivateData; + virNetworkDriverStatePtr driver = conn->networkPrivateData; virNetworkObjPtr network; virNetworkPtr ret = NULL; @@ -2752,7 +2754,7 @@ cleanup: static virNetworkPtr networkLookupByName(virConnectPtr conn, const char *name) { - struct network_driver *driver = conn->networkPrivateData; + virNetworkDriverStatePtr driver = conn->networkPrivateData; virNetworkObjPtr network; virNetworkPtr ret = NULL; @@ -2797,7 +2799,7 @@ static int networkClose(virConnectPtr conn) { static int networkConnectNumOfNetworks(virConnectPtr conn) { int nactive = 0; size_t i; - struct network_driver *driver = conn->networkPrivateData; + virNetworkDriverStatePtr driver = conn->networkPrivateData; if (virConnectNumOfNetworksEnsureACL(conn) < 0) return -1; @@ -2817,7 +2819,7 @@ static int networkConnectNumOfNetworks(virConnectPtr conn) { } static int networkConnectListNetworks(virConnectPtr conn, char **const names, int nnames) { - struct network_driver *driver = conn->networkPrivateData; + virNetworkDriverStatePtr driver = conn->networkPrivateData; int got = 0; size_t i; @@ -2852,7 +2854,7 @@ static int networkConnectListNetworks(virConnectPtr conn, char **const names, in static int networkConnectNumOfDefinedNetworks(virConnectPtr conn) { int ninactive = 0; size_t i; - struct network_driver *driver = conn->networkPrivateData; + virNetworkDriverStatePtr driver = conn->networkPrivateData; if (virConnectNumOfDefinedNetworksEnsureACL(conn) < 0) return -1; @@ -2872,7 +2874,7 @@ static int networkConnectNumOfDefinedNetworks(virConnectPtr conn) { } static int networkConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { - struct network_driver *driver = conn->networkPrivateData; + virNetworkDriverStatePtr driver = conn->networkPrivateData; int got = 0; size_t i; @@ -2908,7 +2910,7 @@ networkConnectListAllNetworks(virConnectPtr conn, virNetworkPtr **nets, unsigned int flags) { - struct network_driver *driver = conn->networkPrivateData; + virNetworkDriverStatePtr driver = conn->networkPrivateData; int ret = -1; virCheckFlags(VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL, -1); @@ -2928,7 +2930,7 @@ cleanup: static int networkIsActive(virNetworkPtr net) { - struct network_driver *driver = net->conn->networkPrivateData; + virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr obj; int ret = -1; @@ -2953,7 +2955,7 @@ cleanup: static int networkIsPersistent(virNetworkPtr net) { - struct network_driver *driver = net->conn->networkPrivateData; + virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr obj; int ret = -1; @@ -2978,7 +2980,7 @@ cleanup: static int -networkValidate(struct network_driver *driver, +networkValidate(virNetworkDriverStatePtr driver, virNetworkDefPtr def, bool check_active) { @@ -3127,7 +3129,7 @@ networkValidate(struct network_driver *driver, } static virNetworkPtr networkCreateXML(virConnectPtr conn, const char *xml) { - struct network_driver *driver = conn->networkPrivateData; + virNetworkDriverStatePtr driver = conn->networkPrivateData; virNetworkDefPtr def; virNetworkObjPtr network = NULL; virNetworkPtr ret = NULL; @@ -3169,7 +3171,7 @@ cleanup: } static virNetworkPtr networkDefineXML(virConnectPtr conn, const char *xml) { - struct network_driver *driver = conn->networkPrivateData; + virNetworkDriverStatePtr driver = conn->networkPrivateData; virNetworkDefPtr def = NULL; bool freeDef = true; virNetworkObjPtr network = NULL; @@ -3227,7 +3229,7 @@ cleanup: static int networkUndefine(virNetworkPtr net) { - struct network_driver *driver = net->conn->networkPrivateData; + virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; int ret = -1; bool active = false; @@ -3284,7 +3286,7 @@ networkUpdate(virNetworkPtr net, const char *xml, unsigned int flags) { - struct network_driver *driver = net->conn->networkPrivateData; + virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network = NULL; int isActive, ret = -1; size_t i; @@ -3430,7 +3432,7 @@ cleanup: } static int networkCreate(virNetworkPtr net) { - struct network_driver *driver = net->conn->networkPrivateData; + virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; int ret = -1; @@ -3456,7 +3458,7 @@ cleanup: } static int networkDestroy(virNetworkPtr net) { - struct network_driver *driver = net->conn->networkPrivateData; + virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; int ret = -1; @@ -3500,7 +3502,7 @@ cleanup: static char *networkGetXMLDesc(virNetworkPtr net, unsigned int flags) { - struct network_driver *driver = net->conn->networkPrivateData; + virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; virNetworkDefPtr def; char *ret = NULL; @@ -3534,7 +3536,7 @@ cleanup: } static char *networkGetBridgeName(virNetworkPtr net) { - struct network_driver *driver = net->conn->networkPrivateData; + virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; char *bridge = NULL; @@ -3568,7 +3570,7 @@ cleanup: static int networkGetAutostart(virNetworkPtr net, int *autostart) { - struct network_driver *driver = net->conn->networkPrivateData; + virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; int ret = -1; @@ -3595,7 +3597,7 @@ cleanup: static int networkSetAutostart(virNetworkPtr net, int autostart) { - struct network_driver *driver = net->conn->networkPrivateData; + virNetworkDriverStatePtr driver = net->conn->networkPrivateData; virNetworkObjPtr network; char *configFile = NULL, *autostartLink = NULL; int ret = -1; @@ -3794,7 +3796,7 @@ finish: int networkAllocateActualDevice(virDomainNetDefPtr iface) { - struct network_driver *driver = driverState; + virNetworkDriverStatePtr driver = driverState; enum virDomainNetType actualType = iface->type; virNetworkObjPtr network = NULL; virNetworkDefPtr netdef = NULL; @@ -4192,7 +4194,7 @@ error: int networkNotifyActualDevice(virDomainNetDefPtr iface) { - struct network_driver *driver = driverState; + virNetworkDriverStatePtr driver = driverState; enum virDomainNetType actualType = virDomainNetGetActualType(iface); virNetworkObjPtr network; virNetworkDefPtr netdef; @@ -4370,7 +4372,7 @@ error: int networkReleaseActualDevice(virDomainNetDefPtr iface) { - struct network_driver *driver = driverState; + virNetworkDriverStatePtr driver = driverState; enum virDomainNetType actualType = virDomainNetGetActualType(iface); virNetworkObjPtr network; virNetworkDefPtr netdef; @@ -4525,7 +4527,7 @@ int networkGetNetworkAddress(const char *netname, char **netaddr) { int ret = -1; - struct network_driver *driver = driverState; + virNetworkDriverStatePtr driver = driverState; virNetworkObjPtr network; virNetworkDefPtr netdef; virNetworkIpDefPtr ipdef; -- 1.7.11.5

2 1

[libvirt] [PATCH] cpu: Let explicit features override model features
by Jiri Denemark 22 Jul '13

22 Jul '13

Until now CPU features inherited from a specified CPU model could only be overridden with 'disable' policy. With this patch, any explicitly specified feature always overrides the same feature inherited from a CPU model regardless on the specified policy. The CPU in x86-exact-force-Haswell.xml would previously be incompatible with x86-host-SandyBridge.xml CPU even though x86-host-SandyBridge.xml provides all features required by x86-exact-force-Haswell.xml. --- src/cpu/cpu_x86.c | 5 +++++ tests/cputest.c | 1 + tests/cputestdata/x86-exact-force-Haswell.xml | 15 +++++++++++++++ tests/cputestdata/x86-host-SandyBridge.xml | 6 ++++++ 4 files changed, 27 insertions(+) create mode 100644 tests/cputestdata/x86-exact-force-Haswell.xml create mode 100644 tests/cputestdata/x86-host-SandyBridge.xml diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 4564bd4..a388f0f 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1223,6 +1223,11 @@ x86Compute(virCPUDefPtr host, goto out; } + /* first remove features that were inherited from the CPU model and were + * explicitly forced, disabled, or made optional + */ + x86DataSubtract(cpu_require->data, cpu_force->data); + x86DataSubtract(cpu_require->data, cpu_optional->data); x86DataSubtract(cpu_require->data, cpu_disable->data); result = x86ModelCompare(host_model, cpu_require); if (result == SUBSET || result == UNRELATED) { diff --git a/tests/cputest.c b/tests/cputest.c index d3865c4..803e395 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -581,6 +581,7 @@ mymain(void) DO_TEST_COMPARE("x86", "host", "pentium3-amd", VIR_CPU_COMPARE_INCOMPATIBLE); DO_TEST_COMPARE("x86", "host-amd", "pentium3-amd", VIR_CPU_COMPARE_SUPERSET); DO_TEST_COMPARE("x86", "host-worse", "nehalem-force", VIR_CPU_COMPARE_IDENTICAL); + DO_TEST_COMPARE("x86", "host-SandyBridge", "exact-force-Haswell", VIR_CPU_COMPARE_IDENTICAL); /* guest updates for migration * automatically compares host CPU with the result */ diff --git a/tests/cputestdata/x86-exact-force-Haswell.xml b/tests/cputestdata/x86-exact-force-Haswell.xml new file mode 100644 index 0000000..614ed7e --- /dev/null +++ b/tests/cputestdata/x86-exact-force-Haswell.xml @@ -0,0 +1,15 @@ +<cpu mode='custom' match='exact'> + <model fallback='allow'>Haswell</model> + <feature policy='force' name='pcid'/> + <feature policy='force' name='rtm'/> + <feature policy='force' name='invpcid'/> + <feature policy='force' name='erms'/> + <feature policy='force' name='bmi2'/> + <feature policy='optional' name='smep'/> + <feature policy='optional' name='avx2'/> + <feature policy='optional' name='hle'/> + <feature policy='force' name='bmi1'/> + <feature policy='force' name='fsgsbase'/> + <feature policy='disable' name='movbe'/> + <feature policy='disable' name='fma'/> +</cpu> diff --git a/tests/cputestdata/x86-host-SandyBridge.xml b/tests/cputestdata/x86-host-SandyBridge.xml new file mode 100644 index 0000000..7f26b7b --- /dev/null +++ b/tests/cputestdata/x86-host-SandyBridge.xml @@ -0,0 +1,6 @@ +<cpu> + <arch>x86_64</arch> + <model>SandyBridge</model> + <vendor>Intel</vendor> + <topology sockets='1' cores='2' threads='2'/> +</cpu> -- 1.8.3.2

2 2

[libvirt] [PATCH 0/3] Several cleanups for cpu driver
by Jiri Denemark 22 Jul '13

22 Jul '13

Jiri Denemark (3): cpu_x86: Use x86-specific CPU data structure Replace union cpuData with virCPUData cpu: Store arch in virCPUData src/cpu/cpu.c | 31 +++-- src/cpu/cpu.h | 62 ++++----- src/cpu/cpu_arm.c | 8 +- src/cpu/cpu_powerpc.c | 12 +- src/cpu/cpu_s390.c | 8 +- src/cpu/cpu_x86.c | 301 +++++++++++++++++++++++++++---------------- src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_command.c | 9 +- src/vmware/vmware_conf.c | 5 +- tests/cputest.c | 10 +- 10 files changed, 264 insertions(+), 186 deletions(-) -- 1.8.3.2

2 11

[libvirt] [RFC PATCH] qemu: Shorten SCSI hostdev alias to avoid QEMU failure
by Viktor Mihajlovski 22 Jul '13

22 Jul '13

The alias for hostdevs of type SCSI can be too long for QEMU if larger LUNs are encountered. Here's a real life example: <hostdev mode='subsystem' type='scsi' managed='no'> <source> <adapter name='scsi_host0'/> <address bus='0' target='19' unit='1088634913'/> </source> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </hostdev> this results in a too long drive id, resulting in QEMU yelling Property 'scsi-generic.drive' can't find value 'drive-hostdev-scsi_host0-0-19-1088634913' This commit changes the alias back to the default hostdev$(index) scheme. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- Actually this is highlighting a larger issue. Apparently QEMU ids are limited to a length of 32 bytes. This means that SCSI based drives are also in danger to exceed this limit. We should consider to use a drive index for controller-attached disks for alias generation instead of the verbose drive-$bustype-$busaddress schema. src/qemu/qemu_command.c | 10 +--------- .../qemuxml2argv-hostdev-scsi-boot.args | 4 ++-- .../qemuxml2argv-hostdev-scsi-lsi.args | 4 ++-- .../qemuxml2argv-hostdev-scsi-readonly.args | 4 ++-- .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 4 ++-- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 879aed8..8c8bef2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -818,16 +818,8 @@ qemuAssignDeviceHostdevAlias(virDomainDefPtr def, virDomainHostdevDefPtr hostdev } } - if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) { - if (virAsprintf(&hostdev->info->alias, "hostdev-%s-%d-%d-%d", - hostdev->source.subsys.u.scsi.adapter, - hostdev->source.subsys.u.scsi.bus, - hostdev->source.subsys.u.scsi.target, - hostdev->source.subsys.u.scsi.unit) < 0) - return -1; - } else if (virAsprintf(&hostdev->info->alias, "hostdev%d", idx) < 0) { + if (virAsprintf(&hostdev->info->alias, "hostdev%d", idx) < 0) return -1; - } return 0; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args index cd22672..ba1e6c6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args @@ -4,6 +4,6 @@ unix:/tmp/test-monitor,server,nowait -no-acpi \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/sg0,if=none,id=drive-hostdev-scsi_host0-0-0-0 \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev-scsi_host0-0-0-0,id=hostdev-scsi_host0-0-0-0,bootindex=1 \ +-drive file=/dev/sg0,if=none,id=drive-hostdev0 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev0,id=hostdev0,bootindex=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args index 06f7938..2cbf9be 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args @@ -4,6 +4,6 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 -usb \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/sg0,if=none,id=drive-hostdev-scsi_host0-0-0-0 \ --device scsi-generic,bus=scsi0.0,scsi-id=7,drive=drive-hostdev-scsi_host0-0-0-0,id=hostdev-scsi_host0-0-0-0 \ +-drive file=/dev/sg0,if=none,id=drive-hostdev0 \ +-device scsi-generic,bus=scsi0.0,scsi-id=7,drive=drive-hostdev0,id=hostdev0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args index ea2f7af..8c274a9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args @@ -4,6 +4,6 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/sg0,if=none,id=drive-hostdev-scsi_host0-0-0-0,readonly=on \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev-scsi_host0-0-0-0,id=hostdev-scsi_host0-0-0-0 \ +-drive file=/dev/sg0,if=none,id=drive-hostdev0,readonly=on \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev0,id=hostdev0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args index b92afc7..a7d6789 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args @@ -4,6 +4,6 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -usb \ -drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/sg0,if=none,id=drive-hostdev-scsi_host0-0-0-0 \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev-scsi_host0-0-0-0,id=hostdev-scsi_host0-0-0-0 \ +-drive file=/dev/sg0,if=none,id=drive-hostdev0 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,drive=drive-hostdev0,id=hostdev0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 -- 1.7.9.5

3 2

[libvirt] [PATCH] Split up platfrom specifics from bridge driver
by Roman Bogorodskiy 22 Jul '13

22 Jul '13

This is a second step for making bridge_driver more portable. This one splits up bridge driver into platform specific and general parts. Platform specifc parts are mostly firewalling stuff. So the support for new platforms should be added by implementing bridge_driver_$platform.c However, you might notice I didn't move some ports of the platform specific code. E.g. I left networkEnableIpForwarding in bridge_driver.c because it feels like the implementation for e.g. all BSDs would be the same (while firewalling stuff would be different on BSDs) to avoid code copy/paste. Roman Bogorodskiy (1): Split up platfrom specifics from bridge driver po/POTFILES.in | 1 + src/Makefile.am | 5 +- src/network/bridge_driver.c | 729 +--------------------------------- src/network/bridge_driver_linux.c | 709 +++++++++++++++++++++++++++++++++ src/network/bridge_driver_noop.c | 80 ++++ src/network/bridge_driver_platform.c | 32 ++ src/network/bridge_driver_platform.h | 77 ++++ 7 files changed, 915 insertions(+), 718 deletions(-) create mode 100644 src/network/bridge_driver_linux.c create mode 100644 src/network/bridge_driver_noop.c create mode 100644 src/network/bridge_driver_platform.c create mode 100644 src/network/bridge_driver_platform.h -- 1.7.9.5

3 7

[libvirt] [PATCH 0/4] qemu: Unplug devices that disappeared when libvirtd was down
by Jiri Denemark 22 Jul '13

22 Jul '13

In case libvirtd is asked to unplug a device but the device is actually unplugged later when libvirtd is not running, we need to detect that and remove such device when libvirtd starts again and reconnects to running domains. Jiri Denemark (4): util: Non-existent string array does not contain any string conf: Make error reporting in virDomainDefFindDevice optional qemu: Introduce qemuMonitorGetDeviceAliases qemu: Unplug devices that disappeared when libvirtd was down src/conf/domain_conf.c | 11 +++++--- src/conf/domain_conf.h | 3 ++- src/qemu/qemu_domain.c | 56 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 4 +++ src/qemu/qemu_driver.c | 6 +++++ src/qemu/qemu_monitor.c | 21 +++++++++++++++ src/qemu/qemu_monitor.h | 4 +++ src/qemu/qemu_monitor_json.c | 38 +++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 4 +++ src/qemu/qemu_process.c | 45 +++++++++++++++++++++++++++++++- src/util/virstring.c | 3 +++ tests/qemumonitorjsontest.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 251 insertions(+), 5 deletions(-) -- 1.8.3.2

2 9

[libvirt] [RESEND PATCH 0/5] Handling of undefine and redefine snapshots with VirtualBox 4.2
by Manuel VIVES 22 Jul '13

22 Jul '13

Hi, This is a serie of patches in order to support undefining and redefining snapshots with VirtualBox 4.2. The serie of patches is rather big, and adds among other things some utility functions unrelated to VirtualBox in patches 1 & 2. The code review could be done in several parts: e.g. patches 1 & 2 separately to validate the utility functions. The VirtualBox API provides only high level operations to manipulate snapshots, so it not possible to support flags like VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY with only API calls. Following an IRC talk with Eric Blake, the decision was taken to emulate these behaviours by manipulating directly the .vbox XML files. The first two patches are some util methods for handling uuid and strings that will be used after. The third patch brings more details in the snapshot XML returned by libvirt. We will need those modifications in order to redefine the snapshots. The fourth patch brings the support of the VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT flags in virDomainSnapshotCreateXML. The fifth and last patch brings the support of the VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY flag in virDomainSnapshotDelete. The patches are only for Virtualbox 4.2 Regards, Manuel VIVES Manuel VIVES (5): viruuid.h/c: Util method for finding uuid patterns in some strings virstring.h/c: Util method for making some find and replace in strings vbox_tmpl.c: Better XML description for snapshots vbox_tmpl.c: Patch for redefining snapshots vbox_tmpl.c: Add methods for undefining snapshots src/conf/domain_conf.c | 20 +- src/libvirt_private.syms | 2 + src/util/virstring.c | 129 ++++ src/util/virstring.h | 6 + src/util/viruuid.c | 79 ++ src/util/viruuid.h | 1 + src/vbox/vbox_tmpl.c | 1821 +++++++++++++++++++++++++++++++++++++++++++--- 7 files changed, 1938 insertions(+), 120 deletions(-) -- 1.7.10.4

2 6

[libvirt] [test-API][PATCH V3] Modify repos/network/network_list.py and add network_list case to conf
by hongming zhang 22 Jul '13

22 Jul '13

Modify the old network_list.py. The new network_list.py covers all flags of listAllNetworks and the following api. and add network_list to basic_network.conf. virNetwork: name() isActive() isPersistent() virConnect: listAllNetworks() V1-> V2 1.Change the flag in conf from digit to string 2.Remove the checking method using the result of virsh with flags 3.Add checking method via checking network autostart dir 4.Modify the basic_network.conf V2 -> V3 1.Remove check_bridge_ip method 2.Remove network.bridgeName() call 3.Fix a typo in log --- cases/basic_network.conf | 35 +++++- repos/network/network_list.py | 260 ++++++++++++++++------------------------- 2 files changed, 130 insertions(+), 165 deletions(-) diff --git a/cases/basic_network.conf b/cases/basic_network.conf index 991ad99..91d7f21 100644 --- a/cases/basic_network.conf +++ b/cases/basic_network.conf @@ -14,10 +14,18 @@ network:define netmode nat +network:network_list + flags + inactive + network:start networkname $defaultnetname +network:network_list + flags + active + network:autostart networkname $defaultnetname @@ -28,6 +36,10 @@ network:destroy networkname $defaultnetname +network:network_list + flags + default + network:undefine networkname $defaultnetname @@ -48,6 +60,10 @@ network:create netmode nat +network:network_list + flags + transient + network:destroy networkname $defaultnetname @@ -68,6 +84,10 @@ network:define netmode route +network:network_list + flags + persistent + network:start networkname $defaultnetname @@ -106,7 +126,6 @@ network:destroy networkname $defaultnetname - network:define networkname $defaultnetname @@ -127,12 +146,20 @@ network:start networkname $defaultnetname +network:network_list + flags + noautostart + network:autostart networkname $defaultnetname autostart enable +network:network_list + flags + autostart + network:destroy networkname $defaultnetname @@ -141,7 +168,6 @@ network:undefine networkname $defaultnetname - network:create networkname $defaultnetname @@ -162,8 +188,3 @@ network:destroy networkname $defaultnetname - - - - - diff --git a/repos/network/network_list.py b/repos/network/network_list.py index 7c34f69..b94b505 100644 --- a/repos/network/network_list.py +++ b/repos/network/network_list.py @@ -1,184 +1,128 @@ #!/usr/bin/env python # To test "virsh net-list" command -import os -import sys -import re -import commands - import libvirt from libvirt import libvirtError from src import sharedmod from utils import utils -required_params = ('netlistopt',) +required_params = ('flags',) optional_params = {} -VIRSH_QUIET_NETLIST = "virsh --quiet net-list %s|awk '{print $1}'" -VIRSH_NETLIST = "virsh net-list %s" -GET_BRIDGE_IP = "/sbin/ifconfig %s | grep 'inet addr:' | cut -d: -f2 | awk '{print $1}'" -CONFIG_DIR = "/etc/libvirt/qemu/networks/" +LS_NETWORK_DIR = "ls /etc/libvirt/qemu/networks/" +LS_AUTOSTART_NET = "ls /etc/libvirt/qemu/networks/autostart/" -def get_option_list(params): - """return options we need to test +def check_persistent_netxml(networkname): """ - logger = params['logger'] - option_list=[] - - value = params['netlistopt'] - - if value == 'all': - option_list = [' ', '--all', '--inactive'] - elif value == '--all' or value == '--inactive': - option_list.append(value) - else: - logger.error("value %s is not supported" % value) - return 1, option_list - - return 0, option_list - -def get_output(logger, command, flag): - """execute shell command + Check if the network is persistent via checking network xml dir + if the network is persistent, return True, or return False """ - status, ret = commands.getstatusoutput(command) - if not flag and status: - logger.error("executing "+ "\"" + command + "\"" + " failed") - logger.error(ret) - return status, ret - -def check_all_option(conn, logger): - """check the output of virsh net-list with --all option - """ - all_network = [] - entries = os.listdir(CONFIG_DIR) - logger.debug("%s in %s" % (entries, CONFIG_DIR)) - status, network_names = get_output(logger, VIRSH_QUIET_NETLIST % '--all', 0) - if not status: - all_network = network_names.split('\n') - logger.info("all network is %s" % all_network) - else: - return 1 - - if all_network == ['']: - return 0 - for entry in entries: - if not entry.endswith('.xml'): - continue + (status, output) = utils.exec_cmd(LS_NETWORK_DIR, shell=True) + network_list_dir = [] + if status: + logger.error("Executing " + LS_NETWORK_DIR + " failed") + logger.error(output) + return False + else: + for i in range(len(output)): + network_list_dir.append(output[i][:-4]) + del network_list_dir[0] + logger.info("Get persistent network name list under dir: %s" \ + % network_list_dir) + if networkname in network_list_dir: + return True else: - network = entry[:-4] - if network not in all_network: - logger.error("network %s not in the output of virsh net-list" % network) - return 1 - return 0 + return False -def check_inactive_option(conn, logger): - """check the output of virsh net-list with --inactive option +def check_autostart_netxml(networkname): """ - inactive_network = [] - status, network_names = get_output(logger, VIRSH_QUIET_NETLIST % '--inactive', 0) - if not status: - inactive_network = network_names.split('\n') - logger.info("inactive network: %s" % inactive_network) - else: - return 1 - - if inactive_network == ['']: - return 0 - - for network in inactive_network: - try: - netobj = conn.networkLookupByName(network) - bridgename = netobj.bridgeName() - status, ip = get_output(logger, GET_BRIDGE_IP % bridgename, 1) - - if not status: - logger.info("network %s is inactive as we expected" % network) - else: - logger.error("network %s is not inactive, wrong" % network) - return 1 - except libvirtError, e: - logger.error("API error message: %s, error code is %s" \ - % (e.message, e.get_error_code())) - return 1 - - return 0 - -def check_default_option(conn, logger): - """check the output of virsh net-list + Check if the network is autostart via checking network autostart dir + if the network is autostart , return True, or return False. """ - active_network = [] - status, network_names = get_output(logger, VIRSH_QUIET_NETLIST % '', 0) - if not status: - active_network = network_names.split('\n') - logger.info("running network: %s" % active_network) - else: - return 1 - if active_network == ['']: - return 0 - - for network in active_network: - try: - netobj = conn.networkLookupByName(network) - bridgename = netobj.bridgeName() - status, ip = get_output(logger, GET_BRIDGE_IP % bridgename, 0) - if not status and utils.do_ping(ip, 0): - logger.info("network %s is active as we expected" % network) - logger.debug("%s has ip: %s" % (bridgename, ip)) - else: - logger.error("network %s has no ip or fails to ping" % network) - return 1 - except libvirtError, e: - logger.error("API error message: %s, error code is %s" \ - % (e.message, e.get_error_code())) - return 1 - - return 0 - -def execute_virsh_netlist(option, logger): - """execute virsh net-list command with appropriate option given - """ - status, ret = get_output(logger, VIRSH_NETLIST % option, 0) - if not status: - logger.info(ret) + (status, output) = utils.exec_cmd(LS_AUTOSTART_NET, shell=True) + autostart_list_dir = [] + if status: + logger.error("Executing " + LS_AUTOSTART_NET + " failed") + logger.error(output) + return False + else: + for i in range(len(output)): + autostart_list_dir.append(output[i][:-4]) + logger.info("Get autostart network name list under dir: %s" \ + % autostart_list_dir) + if networkname in autostart_list_dir: + return True + else: + return False def network_list(params): - """test net-list command to virsh with default, --all, --inactive - """ - logger = params['logger'] - ret, option_list = get_option_list(params) - - if ret: - return 1 + """ List network with flag """ + global logger + logger = params['logger'] conn = sharedmod.libvirtobj['conn'] - - for option in option_list: - if option == ' ': - logger.info("check the output of virsh net-list") - if not check_default_option(conn, logger): - logger.info("virsh net-list checking succeeded") - execute_virsh_netlist(option, logger) - else: - logger.error("virsh net-list checking failed") - return 1 - elif option == '--inactive': - logger.info("check the output of virsh net-list --inactive") - if not check_inactive_option(conn, logger): - logger.info("virsh net-list --inactive checking succeeded") - execute_virsh_netlist(option, logger) - else: - logger.error("virsh net-list --inactive checking failed") - return 1 - elif option == '--all': - logger.info("check the output of virsh net-list --all") - if not check_all_option(conn, logger): - logger.info("virsh net-list --all checking succeeded") - execute_virsh_netlist(option, logger) - else: - logger.error("virsh net-list --all checking failed") - return 1 + flags = params['flags'] + logger.info("The given flags is %s " % flags) + flag = -1 + if flags == "default": + flag = 0 + elif flags == "inactive": + flag = 1 + elif flags == "active": + flag = 2 + elif flags == "persistent": + flag = 4 + elif flags == "transient": + flag = 8 + elif flags == "autostart": + flag = 16 + elif flags == "noautostart": + flag = 32 + try: + network_list_api = conn.listAllNetworks(flag) + network_namelist_api = [] + logger.debug("Traverse the network object list %s" % \ + network_list_api) + for network in network_list_api: + networkname = network.name() + logger.info("Network name: %s " % networkname) + # Check if the network is active + if cmp(flags,"active") == 0: + if network.isActive(): + logger.info("The %s network is active" % networkname) + else: + logger.error("Failed ,the %s network isn't active" % \ + networkname) + return 1 + + # Check if the network is persistent + if cmp(flags,"persistent") == 0: + if network.isPersistent() and \ + check_persistent_netxml(networkname): + logger.info("The %s network is persistent" % networkname) + else: + logger.error("Failed ,the %s network isn't persistent" % \ + networkname) + return 1 + + # Check if the network is auto start + if cmp(flags,"autostart") == 0: + if check_autostart_netxml(networkname): + logger.info("The %s network is autostart" % networkname) + else: + logger.error("Failed ,the %s network isn't autostart" % \ + networkname) + return 1 + + network_namelist_api.append(networkname) + logger.info("The network list %s" % network_namelist_api) + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + return 1 return 0 + -- 1.7.1

2 1

[libvirt] [test-API][PATCH V2] Modify repos/network/network_list.py and add network_list case to conf
by hongming zhang 22 Jul '13

22 Jul '13

Modify the old network_list.py. The new network_list.py covers all flags of listAllNetworks and the following api. and add network_list to basic_network.conf. virNetwork: name() bridgeName() isActive() isPersistent() virConnect: listAllNetworks() Changes from V2 to V1 as follows 1.Change the flag in conf from digit to string 2.Remove the checking method using the result of virsh with flags 3.Add checking method via checking network autostart dir 4.Modify the basic_network.conf --- cases/basic_network.conf | 35 ++++- repos/network/network_list.py | 277 ++++++++++++++++++----------------------- 2 files changed, 148 insertions(+), 164 deletions(-) diff --git a/cases/basic_network.conf b/cases/basic_network.conf index 991ad99..91d7f21 100644 --- a/cases/basic_network.conf +++ b/cases/basic_network.conf @@ -14,10 +14,18 @@ network:define netmode nat +network:network_list + flags + inactive + network:start networkname $defaultnetname +network:network_list + flags + active + network:autostart networkname $defaultnetname @@ -28,6 +36,10 @@ network:destroy networkname $defaultnetname +network:network_list + flags + default + network:undefine networkname $defaultnetname @@ -48,6 +60,10 @@ network:create netmode nat +network:network_list + flags + transient + network:destroy networkname $defaultnetname @@ -68,6 +84,10 @@ network:define netmode route +network:network_list + flags + persistent + network:start networkname $defaultnetname @@ -106,7 +126,6 @@ network:destroy networkname $defaultnetname - network:define networkname $defaultnetname @@ -127,12 +146,20 @@ network:start networkname $defaultnetname +network:network_list + flags + noautostart + network:autostart networkname $defaultnetname autostart enable +network:network_list + flags + autostart + network:destroy networkname $defaultnetname @@ -141,7 +168,6 @@ network:undefine networkname $defaultnetname - network:create networkname $defaultnetname @@ -162,8 +188,3 @@ network:destroy networkname $defaultnetname - - - - - diff --git a/repos/network/network_list.py b/repos/network/network_list.py index 7c34f69..175d6fa 100644 --- a/repos/network/network_list.py +++ b/repos/network/network_list.py @@ -1,184 +1,147 @@ #!/usr/bin/env python # To test "virsh net-list" command -import os -import sys -import re -import commands - import libvirt from libvirt import libvirtError from src import sharedmod from utils import utils -required_params = ('netlistopt',) +required_params = ('flags',) optional_params = {} -VIRSH_QUIET_NETLIST = "virsh --quiet net-list %s|awk '{print $1}'" -VIRSH_NETLIST = "virsh net-list %s" -GET_BRIDGE_IP = "/sbin/ifconfig %s | grep 'inet addr:' | cut -d: -f2 | awk '{print $1}'" -CONFIG_DIR = "/etc/libvirt/qemu/networks/" - -def get_option_list(params): - """return options we need to test - """ - logger = params['logger'] - option_list=[] - - value = params['netlistopt'] - - if value == 'all': - option_list = [' ', '--all', '--inactive'] - elif value == '--all' or value == '--inactive': - option_list.append(value) +VIRSH_NETWORK_LIST = "virsh net-list %s|sed -n '3,$'p|awk '{print $1}'" +GET_BRIDGE_IP = "/sbin/ifconfig %s | grep 'inet addr:' | cut -d: -f2 | awk \ + '{print $1}'" +LS_NETWORK_DIR = "ls /etc/libvirt/qemu/networks/" +LS_AUTOSTART_NET = "ls /etc/libvirt/qemu/networks/autostart/" + +def check_bridge_ip(bridgename): + """ Check if the bridge has ip """ + + (status, output) = utils.exec_cmd(GET_BRIDGE_IP % bridgename,\ + shell=True) + if not status and utils.do_ping(output[0], 50): + logger.info("Bridge %s is active" % bridgename) + logger.info("%s has ip: %s" % (bridgename, output[0])) + return True else: - logger.error("value %s is not supported" % value) - return 1, option_list - - return 0, option_list + logger.error("Bridge %s has no ip or fails to ping" % bridgename) + return False -def get_output(logger, command, flag): - """execute shell command +def check_persistent_netxml(networkname): """ - status, ret = commands.getstatusoutput(command) - if not flag and status: - logger.error("executing "+ "\"" + command + "\"" + " failed") - logger.error(ret) - return status, ret - -def check_all_option(conn, logger): - """check the output of virsh net-list with --all option + Check if the network is persistent via checking network xml dir + if the network is persistent, return True, or return False """ - all_network = [] - entries = os.listdir(CONFIG_DIR) - logger.debug("%s in %s" % (entries, CONFIG_DIR)) - status, network_names = get_output(logger, VIRSH_QUIET_NETLIST % '--all', 0) - if not status: - all_network = network_names.split('\n') - logger.info("all network is %s" % all_network) - else: - return 1 - if all_network == ['']: - return 0 - - for entry in entries: - if not entry.endswith('.xml'): - continue + (status, output) = utils.exec_cmd(LS_NETWORK_DIR, shell=True) + network_list_dir = [] + if status: + logger.error("Executing " + LS_NETWORK_DIR + " failed") + logger.error(output) + return False + else: + for i in range(len(output)): + network_list_dir.append(output[i][:-4]) + del network_list_dir[0] + logger.info("Get persistent network name list under dir: %s" \ + % network_list_dir) + if networkname in network_list_dir: + return True else: - network = entry[:-4] - if network not in all_network: - logger.error("network %s not in the output of virsh net-list" % network) - return 1 - return 0 + return False -def check_inactive_option(conn, logger): - """check the output of virsh net-list with --inactive option +def check_autostart_netxml(networkname): """ - inactive_network = [] - status, network_names = get_output(logger, VIRSH_QUIET_NETLIST % '--inactive', 0) - if not status: - inactive_network = network_names.split('\n') - logger.info("inactive network: %s" % inactive_network) - else: - return 1 - - if inactive_network == ['']: - return 0 - - for network in inactive_network: - try: - netobj = conn.networkLookupByName(network) - bridgename = netobj.bridgeName() - status, ip = get_output(logger, GET_BRIDGE_IP % bridgename, 1) - - if not status: - logger.info("network %s is inactive as we expected" % network) - else: - logger.error("network %s is not inactive, wrong" % network) - return 1 - except libvirtError, e: - logger.error("API error message: %s, error code is %s" \ - % (e.message, e.get_error_code())) - return 1 - - return 0 - -def check_default_option(conn, logger): - """check the output of virsh net-list + Check if the network is autostart via checking network autostart dir + if the network is autostart , return True, or return False. """ - active_network = [] - status, network_names = get_output(logger, VIRSH_QUIET_NETLIST % '', 0) - if not status: - active_network = network_names.split('\n') - logger.info("running network: %s" % active_network) - else: - return 1 - if active_network == ['']: - return 0 - - for network in active_network: - try: - netobj = conn.networkLookupByName(network) - bridgename = netobj.bridgeName() - status, ip = get_output(logger, GET_BRIDGE_IP % bridgename, 0) - if not status and utils.do_ping(ip, 0): - logger.info("network %s is active as we expected" % network) - logger.debug("%s has ip: %s" % (bridgename, ip)) - else: - logger.error("network %s has no ip or fails to ping" % network) - return 1 - except libvirtError, e: - logger.error("API error message: %s, error code is %s" \ - % (e.message, e.get_error_code())) - return 1 - - return 0 - -def execute_virsh_netlist(option, logger): - """execute virsh net-list command with appropriate option given - """ - status, ret = get_output(logger, VIRSH_NETLIST % option, 0) - if not status: - logger.info(ret) + (status, output) = utils.exec_cmd(LS_AUTOSTART_NET, shell=True) + autostart_list_dir = [] + if status: + logger.error("Executing " + LS_AUTOSTART_NET + " failed") + logger.error(output) + return False + else: + for i in range(len(output)): + autostart_list_dir.append(output[i][:-4]) + logger.info("Get persistent network name list under dir: %s" \ + % autostart_list_dir) + if networkname in autostart_list_dir: + return True + else: + return False def network_list(params): - """test net-list command to virsh with default, --all, --inactive - """ - logger = params['logger'] - ret, option_list = get_option_list(params) - - if ret: - return 1 + """ List network with flag """ + global logger + logger = params['logger'] conn = sharedmod.libvirtobj['conn'] - - for option in option_list: - if option == ' ': - logger.info("check the output of virsh net-list") - if not check_default_option(conn, logger): - logger.info("virsh net-list checking succeeded") - execute_virsh_netlist(option, logger) - else: - logger.error("virsh net-list checking failed") - return 1 - elif option == '--inactive': - logger.info("check the output of virsh net-list --inactive") - if not check_inactive_option(conn, logger): - logger.info("virsh net-list --inactive checking succeeded") - execute_virsh_netlist(option, logger) - else: - logger.error("virsh net-list --inactive checking failed") - return 1 - elif option == '--all': - logger.info("check the output of virsh net-list --all") - if not check_all_option(conn, logger): - logger.info("virsh net-list --all checking succeeded") - execute_virsh_netlist(option, logger) - else: - logger.error("virsh net-list --all checking failed") - return 1 + flags = params['flags'] + logger.info("The given flags are %s " % flags) + flag = -1 + if flags == "default": + flag = 0 + elif flags == "inactive": + flag = 1 + elif flags == "active": + flag = 2 + elif flags == "persistent": + flag = 4 + elif flags == "transient": + flag = 8 + elif flags == "autostart": + flag = 16 + elif flags == "noautostart": + flag = 32 + try: + network_list_api = conn.listAllNetworks(flag) + network_namelist_api = [] + logger.debug("Traverse the network object list %s" % \ + network_list_api) + for network in network_list_api: + networkname = network.name() + bridgename = network.bridgeName() + logger.info("Network name: %s " % networkname) + logger.info("Network %s 's bridge name: %s " % (networkname ,\ + bridgename)) + # Check if the network is active + if cmp(flags,"active") == 0: + if network.isActive() and check_bridge_ip(bridgename): + logger.info("The %s network is active" % networkname) + else: + logger.error("Failed ,the %s network isn't active" % \ + networkname) + return 1 + + # Check if the network is persistent + if cmp(flags,"persistent") == 0: + if network.isPersistent() and \ + check_persistent_netxml(networkname): + logger.info("The %s network is persistent" % networkname) + else: + logger.error("Failed ,the %s network isn't persistent" % \ + networkname) + return 1 + + # Check if the network is auto start + if cmp(flags,"autostart") == 0: + if check_autostart_netxml(networkname): + logger.info("The %s network is autostart" % networkname) + else: + logger.error("Failed ,the %s network isn't autostart" % \ + networkname) + return 1 + + network_namelist_api.append(networkname) + logger.info("The network list %s" % network_namelist_api) + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + return 1 return 0 + -- 1.7.1

2 1