- Devel - libvirt List Archives

[libvirt] inconsistent handling of "qemu64" CPU model
by Chris Friesen 26 May '16

26 May '16

Hi, I'm not sure where the problem lies, hence the CC to both lists. Please copy me on the reply. I'm playing with OpenStack's devstack environment on an Ubuntu 14.04 host with a Celeron 2961Y CPU. (libvirt detects it as a Nehalem with a bunch of extra features.) Qemu gives version 2.2.0 (Debian 1:2.2+dfsg-5expubuntu9.7~cloud2). If I don't specify a virtual CPU model, it appears to give me a "qemu64" CPU, and /proc/cpuinfo in the guest instance looks something like this: processor 0 vendor_id GenuineIntel cpu family 6 model 6 model name: QEMU Virtual CPU version 2.2.0 stepping: 3 microcode: 0x1 flags: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 syscall nx lm rep_good nopl pni vmx cx16 x2apic popcnt hypervisor lahf_lm abm vnmi ept However, if I explicitly specify a custom CPU model of "qemu64" the instance refuses to boot and I get a log saying: libvirtError: unsupported configuration: guest and host CPU are not compatible: Host CPU does not provide required features: svmlibvirtError: unsupported configuration: guest and host CPU are not compatible: Host CPU does not provide required features: svm When this happens, some of the XML for the domain looks like this: <os> <type arch='x86_64' machine='pc-i440fx-utopic'>hvm</type> .... <cpu mode='custom' match='exact'> <model fallback='allow'>qemu64</model> <topology sockets='1' cores='1' threads='1'/> </cpu> Of course "svm" is an AMD flag and I'm running an Intel CPU. But why does it work when I just rely on the default virtual CPU? Is kvm_default_unset_features handled differently when it's implicit vs explicit? If I explicitly specify a custom CPU model of "kvm64" then it boots, but of course I get a different virtual CPU from what I get if I don't specify anything. Following some old suggestions I tried turning off nested kvm, deleting /var/cache/libvirt/qemu/capabilities/*, and restarting libvirtd. Didn't help. So...anyone got any ideas what's going on? Is there no way to explicitly specify the model that you get by default? Thanks, Chris

3 3

[libvirt] [PATCH 0/8] lxc: add job support
by Katerina Koukiou 26 May '16

26 May '16

This patch series adds job support to the lxc driver, using techiques from the libxl driver. One benefit is no longer blocking get operations during long running modify operations. E.g. with these patches 'vish dominfo dom' will work while 'virsh save dom ...' is in progress. The first patch adds the job support machinery, followed by several patches that make use of it. Although this might look not needed that much right now, it is preparing environment for future work. This patch series has been reviewed by Michal Privoznik who is my mentor for GSoC 2016. Katerina Koukiou (8): lxc: Add job support to lxc driver lxc: use job functions in lxcDomain{CreateXMLWithFiles, CreateWithFiles} lxc: use job functions in lxcDomainSetMemoryFlags lxc: use job functions in lxcDomain{Suspend, Resume} lxc: use job functions in lxcDomain{AttachDeviceFlags, DetachDeviceFlags, UpdateDeviceFlags} lxc: add job functions in lxcDomainSetAutostart lxc: use job functions in lxcDomain* functions that do query operations. lxc: use job functions in lxcDomain* functions that perform modify actions. src/lxc/lxc_domain.c | 154 ++++++++++++++++++++-- src/lxc/lxc_domain.h | 37 ++++++ src/lxc/lxc_driver.c | 351 ++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 428 insertions(+), 114 deletions(-) -- 2.7.4

4 12

[libvirt] [PATCH] daemon: cleanup state drivers in order reverse to init order
by Nikolay Shirokovskiy 26 May '16

26 May '16

This patch aims to fix observed crash on daemon shutdown. Main thread is in the process of state drivers cleanup, network driver is cleaned up and qemu driver is not yet. Meanwhile eof event from qemu process triggers qemuProcessStop -> networkReleaseActualDevice and crash happens as network driver is already cleaned up. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/libvirt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 114e88c..d79fe75 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -800,12 +800,12 @@ virStateInitialize(bool privileged, int virStateCleanup(void) { - size_t i; + int r; int ret = 0; - for (i = 0; i < virStateDriverTabCount; i++) { - if (virStateDriverTab[i]->stateCleanup && - virStateDriverTab[i]->stateCleanup() < 0) + for (r = virStateDriverTabCount - 1; r >= 0; r--) { + if (virStateDriverTab[r]->stateCleanup && + virStateDriverTab[r]->stateCleanup() < 0) ret = -1; } return ret; -- 1.8.3.1

2 3

[libvirt] [PATCH 0/3] esx: improve virtualHW > 7 handling.
by Dawid Zamirski 26 May '16

26 May '16

Hello, The following patches are for issues found when using libvirt to create/manage VMs on ESXi hosts (5.5 and 6). The first patch addresses a fairly common issue with creating VMs on ESXi with SCSI controllers. The other two are to less common but work around known ESX issues e.g. 4TB drive size limit and vMotion compatibility. Dawid Zamirski (3): esx: add pciBridge devices when SCSI is used esx: Add VMCI device for virtualHW >= 7 esx: use newer virtualHW version for 5.1+ hosts src/esx/esx_vi.c | 17 ++++++++++++++ src/vmx/vmx.c | 27 ++++++++++++++++++++++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx | 14 +++++++++++ .../xml2vmxdata/xml2vmx-serial-network-client.vmx | 1 + .../xml2vmxdata/xml2vmx-serial-network-server.vmx | 1 + tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx | 14 +++++++++++ tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx | 14 +++++++++++ 7 files changed, 88 insertions(+) -- 2.7.4

2 6

[libvirt] Question on output of virsh capabilities
by Eli Qiao 26 May '16

26 May '16

hi I am confused by the libvirt's "virsh capabilities" help said: DESCRIPTION Returns capabilities of hypervisor/driver. I got follow outtput of a host. <cpu> <arch>x86_64</arch> <model>Broadwell-noTSX</model> <vendor>Intel</vendor> <topology sockets='1' cores='2' threads='2'/> <feature name='invtsc'/> <feature name='mpx'/> <feature name='abm'/> <feature name='pdpe1gb'/> <feature name='rdrand'/> <feature name='f16c'/> <feature name='osxsave'/> <feature name='pdcm'/> <feature name='xtpr'/> <feature name='tm2'/> <feature name='est'/> <feature name='vmx'/> <feature name='ds_cpl'/> <feature name='monitor'/> <feature name='dtes64'/> <feature name='pbe'/> <feature name='tm'/> <feature name='ht'/> <feature name='ss'/> <feature name='acpi'/> <feature name='ds'/> <feature name='vme'/> <pages unit='KiB' size='4'/> <pages unit='KiB' size='2048'/> <pages unit='KiB' size='1048576'/> </cpu> but from cat /proc/cpuinfo flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp The output of virsh seems missed some of the cpu features so my question what doesn't the features of "virsh capibalities" mean? why not pass all cpu flags? I see there is a cpu_map.xml in libvirt source, what does it used for? I have requirements to get all the hypervisors feature, what should I do? Thanks. -- Best Regards, Eli Qiao (乔立勇) Intel OTC China

2 1

[libvirt] [PATCH 00/19] Drop virt prefix from tests
by Tomáš Ryšavý 26 May '16

26 May '16

Replacig virt prefix with vir prefix in tests. It was suggested on wikipage: http://wiki.libvirt.org/page/BiteSizedTasks#Rename_test_suite_routines_from… Tomáš Ryšavý (19): tests: Rename virtTestRun to virTestRun. tests: Rename virtTestDifference to virTestDifference. tests: Rename virtTestLoadFile to virTestLoadFile. tests: Rename virtTestCompareToFile to virTestCompareToFile. tests: Rename virtTestDifferenceFull to virTestDifferenceFull. tests: Rename virtTestClearCommandPath to virTestClearCommandPath. tests: Rename virtTest00MActive to virTest00MActive. tests: Rename virtTestCounterReset to virTestCounterReset. tests: Rename virtTestLogContentAndReset to virTestLogContentAndReset. tests: Rename virtTestUseTerminalColors to virTestUseTerminalColors. tests: Rename virtTestQuiesceLibvirtErrors to virTestQuiesceLibvirtErrors. tests: Rename virtTestDifferenceFullNoRegenerate. tests: Rename virtTestDifferenceFullInternal to virTestDifferenceFullInternal. tests: Rename virtTestCaptureProgramExecChild to virTestCaptureProgramExecChild. tests: Rename virtTestDifferenceBin to virTestDifferenceBin. tests: Rename virtTestCaptureProgramOutput to virTestCaptureProgramOutput. tests: Rename virtTestCounterNext to virTestCounterNext. tests: Rename virtTestErrorFuncQuiet to virTestErrorFuncQuiet. tests: Rename virtTestMain to virTestMain. tests/bhyvexml2argvtest.c | 8 ++--- tests/bhyvexml2xmltest.c | 2 +- tests/commandtest.c | 18 +++++----- tests/cputest.c | 8 ++--- tests/domaincapstest.c | 6 ++-- tests/domainconftest.c | 2 +- tests/domainsnapshotxml2xmltest.c | 8 ++--- tests/esxutilstest.c | 10 +++--- tests/eventtest.c | 2 +- tests/fchosttest.c | 10 +++--- tests/fdstreamtest.c | 8 ++--- tests/genericxml2xmltest.c | 2 +- tests/interfacexml2xmltest.c | 6 ++-- tests/jsontest.c | 8 ++--- tests/libvirtdconftest.c | 2 +- tests/lxcconf2xmltest.c | 6 ++-- tests/lxcxml2xmltest.c | 2 +- tests/metadatatest.c | 10 +++--- tests/networkxml2conftest.c | 6 ++-- tests/networkxml2firewalltest.c | 6 ++-- tests/networkxml2xmltest.c | 4 +-- tests/networkxml2xmlupdatetest.c | 6 ++-- tests/nodedevxml2xmltest.c | 6 ++-- tests/nodeinfotest.c | 8 ++--- tests/nsstest.c | 2 +- tests/nwfilterebiptablestest.c | 42 +++++++++++----------- tests/nwfilterxml2firewalltest.c | 6 ++-- tests/nwfilterxml2xmltest.c | 4 +-- tests/objecteventtest.c | 18 +++++----- tests/openvzutilstest.c | 6 ++-- tests/qemuagenttest.c | 2 +- tests/qemuargv2xmltest.c | 10 +++--- tests/qemucapabilitiestest.c | 6 ++-- tests/qemucaps2xmltest.c | 6 ++-- tests/qemucommandutiltest.c | 4 +-- tests/qemuhelptest.c | 6 ++-- tests/qemuhotplugtest.c | 10 +++--- tests/qemumonitorjsontest.c | 14 ++++---- tests/qemumonitortest.c | 6 ++-- tests/qemuxml2argvtest.c | 64 ++++++++++++++++----------------- tests/qemuxml2xmltest.c | 14 ++++---- tests/scsihosttest.c | 4 +-- tests/secretxml2xmltest.c | 4 +-- tests/securityselinuxlabeltest.c | 2 +- tests/securityselinuxtest.c | 26 +++++++------- tests/sexpr2xmltest.c | 6 ++-- tests/sockettest.c | 66 +++++++++++++++++----------------- tests/storagebackendsheepdogtest.c | 4 +-- tests/storagepoolxml2xmltest.c | 4 +-- tests/storagevolxml2argvtest.c | 4 +-- tests/storagevolxml2xmltest.c | 4 +-- tests/sysinfotest.c | 4 +-- tests/testutils.c | 74 +++++++++++++++++++------------------- tests/testutils.h | 68 +++++++++++++++++------------------ tests/utiltest.c | 6 ++-- tests/vboxsnapshotxmltest.c | 10 +++--- tests/viralloctest.c | 14 ++++---- tests/viratomictest.c | 4 +-- tests/virauthconfigtest.c | 16 ++++----- tests/virbitmaptest.c | 26 +++++++------- tests/virbuftest.c | 16 ++++----- tests/vircaps2xmltest.c | 4 +-- tests/vircapstest.c | 8 ++--- tests/vircgrouptest.c | 36 +++++++++---------- tests/vircryptotest.c | 4 +-- tests/virdbustest.c | 20 +++++------ tests/virdrivermoduletest.c | 8 ++--- tests/virendiantest.c | 4 +-- tests/virfiletest.c | 6 ++-- tests/virfirewalltest.c | 36 +++++++++---------- tests/virhashtest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/viridentitytest.c | 12 +++---- tests/viriscsitest.c | 6 ++-- tests/virkeycodetest.c | 4 +-- tests/virkeyfiletest.c | 2 +- tests/virkmodtest.c | 6 ++-- tests/virlockspacetest.c | 14 ++++---- tests/virlogtest.c | 2 +- tests/virnetdaemontest.c | 4 +-- tests/virnetdevbandwidthtest.c | 4 +-- tests/virnetdevtest.c | 2 +- tests/virnetmessagetest.c | 16 ++++----- tests/virnetserverclienttest.c | 2 +- tests/virnetsockettest.c | 32 ++++++++--------- tests/virnettlscontexttest.c | 2 +- tests/virnettlssessiontest.c | 58 +++++++++++++++--------------- tests/virpcitest.c | 6 ++-- tests/virpolkittest.c | 12 +++---- tests/virportallocatortest.c | 8 ++--- tests/virrandomtest.c | 2 +- tests/virrotatingfiletest.c | 26 +++++++------- tests/virscsitest.c | 4 +-- tests/virshtest.c | 38 ++++++++++---------- tests/virstoragetest.c | 12 +++---- tests/virstringtest.c | 62 ++++++++++++++++---------------- tests/virsystemdtest.c | 52 +++++++++++++-------------- tests/virtimetest.c | 52 +++++++++++++-------------- tests/virtypedparamtest.c | 8 ++--- tests/viruritest.c | 24 ++++++------- tests/virusbtest.c | 14 ++++---- tests/vmwarevertest.c | 4 +-- tests/vmx2xmltest.c | 6 ++-- tests/xencapstest.c | 24 ++++++------- tests/xlconfigtest.c | 10 +++--- tests/xmconfigtest.c | 10 +++--- tests/xml2sexprtest.c | 4 +-- tests/xml2vmxtest.c | 4 +-- 108 files changed, 707 insertions(+), 707 deletions(-) -- 2.5.5

2 21

[libvirt] [PATCH] esx: do not store escaped password in esxVI_Context.
by Dawid Zamirski 26 May '16

26 May '16

This patch fixes an issue where screenshot API call was failing when the esx/vcenter password contains special characters such as apostrophee. The reason for failures was that passwords were escaped for XML and stored in esxVI_Context which was then passed to raw CURL API calls where the password must be passed in original form to authenticate successfully. So this patch addresses this by storing original passwords in the esxVI_Context struct and escape only for esxVI_Login call. --- src/esx/esx_driver.c | 22 ++++------------------ src/esx/esx_vi.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 00d0e0a..031c666 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -617,7 +617,6 @@ esxConnectToHost(esxPrivate *priv, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; - char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; esxVI_String *propertyNameList = NULL; @@ -647,18 +646,13 @@ esxConnectToHost(esxPrivate *priv, } } - unescapedPassword = virAuthGetPassword(conn, auth, "esx", username, conn->uri->server); + password = virAuthGetPassword(conn, auth, "esx", username, conn->uri->server); - if (!unescapedPassword) { + if (!password) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } - password = esxUtil_EscapeForXml(unescapedPassword); - - if (!password) - goto cleanup; - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, conn->uri->server, conn->uri->port) < 0) goto cleanup; @@ -705,7 +699,6 @@ esxConnectToHost(esxPrivate *priv, cleanup: VIR_FREE(username); - VIR_FREE(unescapedPassword); VIR_FREE(password); VIR_FREE(url); esxVI_String_Free(&propertyNameList); @@ -726,7 +719,6 @@ esxConnectToVCenter(esxPrivate *priv, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; - char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; @@ -752,18 +744,13 @@ esxConnectToVCenter(esxPrivate *priv, } } - unescapedPassword = virAuthGetPassword(conn, auth, "esx", username, hostname); + password = virAuthGetPassword(conn, auth, "esx", username, hostname); - if (!unescapedPassword) { + if (!password) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } - password = esxUtil_EscapeForXml(unescapedPassword); - - if (!password) - goto cleanup; - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, hostname, conn->uri->port) < 0) goto cleanup; @@ -799,7 +786,6 @@ esxConnectToVCenter(esxPrivate *priv, cleanup: VIR_FREE(username); - VIR_FREE(unescapedPassword); VIR_FREE(password); VIR_FREE(url); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index bf6f228..872cb7d 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -996,6 +996,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, const char *password, esxUtil_ParsedUri *parsedUri) { + char *escapedPassword = NULL; + if (!ctx || !url || !ipAddress || !username || !password || ctx->url || ctx->service || ctx->curl) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -1107,7 +1109,16 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (ctx->productLine == esxVI_ProductLine_VPX) ctx->hasSessionIsActive = true; - if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0 || + escapedPassword = esxUtil_EscapeForXml(password); + + if (!escapedPassword) { + VIR_FREE(escapedPassword); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to escape password for XML")); + return -1; + } + + if (esxVI_Login(ctx, username, escapedPassword, NULL, &ctx->session) < 0 || esxVI_BuildSelectSetCollection(ctx) < 0) { return -1; } -- 2.7.4

3 3

[libvirt] [PATCH] lxc: support <interface type='ethernet'>
by Laine Stump 25 May '16

25 May '16

This is identical to type='bridge', but without the "connect to a bridge" part, so it can be handled by using the same functions (and often even the same cases in switch statements), after renaming virLXCProcessSetupInterfaceBridged() to virLXCProcessInterfaceTap() and enhancing it to skip bridge-related items when brname == NULL. To be truly useful, we need to support setting the ip address on the host side veth as well as guest side veth (already supported for type='bridge'), as well as setting the peer address for both. The <script> element isn't supported in this patch because I have no need for it. I'd rather add it after determining it's needed rather than adding it for no reason and than being required to support it forever. --- I wrote this mostly so that I could experiment with setting the peer addresses of both sides of the veth pair to see what was usable and what we needed to support in terms of setting IP addresses. I had intended to post this patch along with patches to re-enable the peer address setting patches that I reverted just before 1.3.4 was released, but decided that having lxc <interface type='ethernet'> already in might help in any discussion we had about that (since it gives everyone a working example where libvirt has control of both the host-side and guest-side interface config. This will of course be much more useful once the IP addresses can be set from within libvirt, but all code that is here will remain and, as I said above, it provides a useful platform for experimentation. src/lxc/lxc_controller.c | 4 +- src/lxc/lxc_driver.c | 16 ++++--- src/lxc/lxc_native.c | 15 +++---- src/lxc/lxc_process.c | 36 +++++++-------- src/lxc/lxc_process.h | 6 +-- tests/lxcconf2xmldata/lxcconf2xml-ethernet.config | 44 ++++++++++++++++++ tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml | 54 +++++++++++++++++++++++ tests/lxcconf2xmltest.c | 1 + tests/lxcxml2xmldata/lxc-ethernet.xml | 42 ++++++++++++++++++ tests/lxcxml2xmltest.c | 1 + 10 files changed, 181 insertions(+), 38 deletions(-) create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-ethernet.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml create mode 100644 tests/lxcxml2xmldata/lxc-ethernet.xml diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 0304354..25f28ea 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2015 Red Hat, Inc. + * Copyright (C) 2010-2016 Red Hat, Inc. * Copyright IBM Corp. 2008 * * lxc_controller.c: linux container process controller @@ -371,6 +371,7 @@ static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl) switch (ctrl->def->nets[i]->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_ETHERNET: if (ctrl->def->nets[i]->ifname == NULL) continue; if (virNetDevGetIndex(ctrl->def->nets[i]->ifname, @@ -386,7 +387,6 @@ static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl) break; case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index a226850..f811053 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2015 Red Hat, Inc. + * Copyright (C) 2010-2016 Red Hat, Inc. * Copyright IBM Corp. 2008 * * lxc_driver.c: linux container driver functions @@ -4225,15 +4225,15 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, _("No bridge name specified")); goto cleanup; } - if (!(veth = virLXCProcessSetupInterfaceBridged(vm->def, - net, - brname))) + if (!(veth = virLXCProcessSetupInterfaceTap(vm->def, net, brname))) goto cleanup; } break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (!(veth = virLXCProcessSetupInterfaceTap(vm->def, net, NULL))) + goto cleanup; + break; case VIR_DOMAIN_NET_TYPE_DIRECT: { - if (!(veth = virLXCProcessSetupInterfaceDirect(conn, - vm->def, - net))) + if (!(veth = virLXCProcessSetupInterfaceDirect(conn, vm->def, net))) goto cleanup; } break; default: @@ -4270,6 +4270,7 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_ETHERNET: ignore_value(virNetDevVethDelete(veth)); break; @@ -4695,6 +4696,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_ETHERNET: if (virNetDevVethDelete(detach->ifname) < 0) { virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 31ffce7..0bea32e 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -360,14 +360,13 @@ lxcCreateNetDef(const char *type, net->mac = macAddr; if (STREQ(type, "veth")) { - if (!linkdev) - goto error; - - net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; - - if (VIR_STRDUP(net->data.bridge.brname, linkdev) < 0) - goto error; - + if (linkdev) { + net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; + if (VIR_STRDUP(net->data.bridge.brname, linkdev) < 0) + goto error; + } else { + net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; + } } else if (STREQ(type, "macvlan")) { net->type = VIR_DOMAIN_NET_TYPE_DIRECT; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 8981d9a..f8a0c32 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -256,9 +256,9 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, } -char *virLXCProcessSetupInterfaceBridged(virDomainDefPtr vm, - virDomainNetDefPtr net, - const char *brname) +char *virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, + virDomainNetDefPtr net, + const char *brname) { char *ret = NULL; char *parentVeth; @@ -277,13 +277,15 @@ char *virLXCProcessSetupInterfaceBridged(virDomainDefPtr vm, if (virNetDevSetMAC(containerVeth, &net->mac) < 0) goto cleanup; - if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { - if (virNetDevOpenvswitchAddPort(brname, parentVeth, &net->mac, - vm->uuid, vport, virDomainNetGetActualVlan(net)) < 0) - goto cleanup; - } else { - if (virNetDevBridgeAddPort(brname, parentVeth) < 0) - goto cleanup; + if (brname) { + if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { + if (virNetDevOpenvswitchAddPort(brname, parentVeth, &net->mac, vm->uuid, + vport, virDomainNetGetActualVlan(net)) < 0) + goto cleanup; + } else { + if (virNetDevBridgeAddPort(brname, parentVeth) < 0) + goto cleanup; + } } if (virNetDevSetOnline(parentVeth, true) < 0) @@ -546,20 +548,18 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, _("No bridge name specified")); goto cleanup; } - if (!(veth = virLXCProcessSetupInterfaceBridged(def, - net, - brname))) + if (!(veth = virLXCProcessSetupInterfaceTap(def, net, brname))) goto cleanup; } break; - + case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (!(veth = virLXCProcessSetupInterfaceTap(def, net, NULL))) + goto cleanup; + break; case VIR_DOMAIN_NET_TYPE_DIRECT: - if (!(veth = virLXCProcessSetupInterfaceDirect(conn, - def, - net))) + if (!(veth = virLXCProcessSetupInterfaceDirect(conn, def, net))) goto cleanup; break; - case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: diff --git a/src/lxc/lxc_process.h b/src/lxc/lxc_process.h index b6c8083..fcb50a8 100644 --- a/src/lxc/lxc_process.h +++ b/src/lxc/lxc_process.h @@ -47,9 +47,9 @@ void virLXCProcessAutostartAll(virLXCDriverPtr driver); int virLXCProcessReconnectAll(virLXCDriverPtr driver, virDomainObjListPtr doms); -char *virLXCProcessSetupInterfaceBridged(virDomainDefPtr vm, - virDomainNetDefPtr net, - const char *brname); +char *virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, + virDomainNetDefPtr net, + const char *brname); char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, virDomainDefPtr def, virDomainNetDefPtr net); diff --git a/tests/lxcconf2xmldata/lxcconf2xml-ethernet.config b/tests/lxcconf2xmldata/lxcconf2xml-ethernet.config new file mode 100644 index 0000000..d39917d --- /dev/null +++ b/tests/lxcconf2xmldata/lxcconf2xml-ethernet.config @@ -0,0 +1,44 @@ +# Template used to create this container: opensuse +# Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef + +lxc.network.type = veth +lxc.network.flags = up +lxc.network.hwaddr = 02:00:15:8f:05:c1 +lxc.network.name = eth0 +lxc.network.ipv4 = 192.168.122.2/24 +lxc.network.ipv4.gateway = 192.168.122.1 +lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64 +lxc.network.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595 + +#remove next line if host DNS configuration should not be available to container +lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0 +lxc.mount.entry = sysfs sys sysfs defaults 0 0 +lxc.mount.entry = tmpfs run tmpfs size=8m,mode=0755,nodev,nosuid 0 0 +lxc.mount.entry = /etc/resolv.conf etc/resolv.conf none bind,ro 0 0 +lxc.rootfs = /var/lib/lxc/migrate_test/rootfs +lxc.utsname = migrate_test +lxc.arch = x86 +lxc.autodev=1 +lxc.tty = 2 +lxc.pts = 1024 +lxc.cap.drop = sys_module mac_admin mac_override mknod + +# When using LXC with apparmor, uncomment the next line to run unconfined: +#lxc.aa_profile = unconfined + +lxc.cgroup.devices.deny = a +# /dev/null and zero +lxc.cgroup.devices.allow = c 1:3 rwm +lxc.cgroup.devices.allow = c 1:5 rwm +# consoles +lxc.cgroup.devices.allow = c 5:1 rwm +lxc.cgroup.devices.allow = c 5:0 rwm +lxc.cgroup.devices.allow = c 4:0 rwm +lxc.cgroup.devices.allow = c 4:1 rwm +# /dev/{,u}random +lxc.cgroup.devices.allow = c 1:9 rwm +lxc.cgroup.devices.allow = c 1:8 rwm +lxc.cgroup.devices.allow = c 136:* rwm +lxc.cgroup.devices.allow = c 5:2 rwm +# rtc +lxc.cgroup.devices.allow = c 254:0 rwm diff --git a/tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml b/tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml new file mode 100644 index 0000000..24b017a --- /dev/null +++ b/tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml @@ -0,0 +1,54 @@ +<domain type='lxc'> + <name>migrate_test</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>65536</memory> + <currentMemory unit='KiB'>65536</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686'>exe</type> + <init>/sbin/init</init> + </os> + <features> + <capabilities policy='allow'> + <mac_admin state='off'/> + <mac_override state='off'/> + <mknod state='off'/> + <sys_module state='off'/> + </capabilities> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/var/lib/lxc/migrate_test/rootfs'/> + <target dir='/'/> + </filesystem> + <filesystem type='ram' accessmode='passthrough'> + <source usage='8192' units='KiB'/> + <target dir='/run'/> + </filesystem> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/etc/resolv.conf'/> + <target dir='/etc/resolv.conf'/> + <readonly/> + </filesystem> + <interface type='ethernet'> + <mac address='02:00:15:8f:05:c1'/> + <ip address='192.168.122.2' family='ipv4' prefix='24'/> + <ip address='2003:db8:1:0:214:1234:fe0b:3596' family='ipv6' prefix='64'/> + <route family='ipv4' address='0.0.0.0' gateway='192.168.122.1'/> + <route family='ipv6' address='::' gateway='2003:db8:1:0:214:1234:fe0b:3595'/> + <guest dev='eth0'/> + <link state='up'/> + </interface> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + <console type='pty'> + <target type='lxc' port='1'/> + </console> + </devices> +</domain> diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c index 83895cd..7a0893e 100644 --- a/tests/lxcconf2xmltest.c +++ b/tests/lxcconf2xmltest.c @@ -119,6 +119,7 @@ mymain(void) DO_TEST("cputune", false); DO_TEST("cpusettune", false); DO_TEST("blkiotune", false); + DO_TEST("ethernet", false); virObjectUnref(xmlopt); virObjectUnref(caps); diff --git a/tests/lxcxml2xmldata/lxc-ethernet.xml b/tests/lxcxml2xmldata/lxc-ethernet.xml new file mode 100644 index 0000000..6c4a739 --- /dev/null +++ b/tests/lxcxml2xmldata/lxc-ethernet.xml @@ -0,0 +1,42 @@ +<domain type='lxc'> + <name>8675309</name> + <uuid>e21987a5-e98e-9c99-0e35-803e4d9ad1fe</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <resource> + <partition>/machine</partition> + </resource> + <os> + <type arch='x86_64'>exe</type> + <init>/sbin/init</init> + </os> + <idmap> + <uid start='0' target='100000' count='100000'/> + <gid start='0' target='100000' count='100000'/> + </idmap> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/mach/8675309'/> + <target dir='/'/> + </filesystem> + <interface type='ethernet'> + <mac address='00:16:3e:0f:ef:8a'/> + <ip address='192.168.122.12' family='ipv4' prefix='24'/> + <ip address='192.168.122.13' family='ipv4' prefix='24'/> + <route family='ipv4' address='0.0.0.0' gateway='192.168.122.1'/> + <route family='ipv4' address='192.168.124.0' prefix='24' gateway='192.168.124.1'/> + <target dev='veth0'/> + <guest dev='eth2'/> + </interface> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> + <seclabel type='none'/> +</domain> diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index fec0142..001aa8d 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -94,6 +94,7 @@ mymain(void) DO_TEST("idmap"); DO_TEST("capabilities"); DO_TEST("sharenet"); + DO_TEST("ethernet"); DO_TEST_FULL("filesystem-root", 0, false, VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS); -- 2.5.5

4 15

[libvirt] [PATCH v2 0/3] auto-assign controller indexes
by Laine Stump 25 May '16

25 May '16

Patches 1 and 2 just shuffle a couple of existing functions. Patch 3 gets to the point. v1->v2 changes are explained in patch 3. Laine Stump (3): conf/qemu: make IS_USB2_CONTROLLER globally available conf: make virDomainControllerFindUnusedIndex() more generally usable conf: permit auto-assignment of controller indexes docs/formatdomain.html.in | 7 +- docs/schemas/domaincommon.rng | 8 +- src/conf/domain_conf.c | 128 ++++++++++++++--- src/conf/domain_conf.h | 10 +- src/libvirt_private.syms | 1 + src/qemu/qemu_domain_address.c | 7 - src/qemu/qemu_driver.c | 5 +- src/qemu/qemu_hotplug.c | 8 ++ tests/qemuxml2argvdata/qemuxml2argv-autoindex.args | 53 +++++++ tests/qemuxml2argvdata/qemuxml2argv-autoindex.xml | 54 ++++++++ tests/qemuxml2argvtest.c | 9 ++ .../qemuxml2xmlout-autoindex.xml | 153 +++++++++++++++++++++ tests/qemuxml2xmltest.c | 10 +- 13 files changed, 421 insertions(+), 32 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-autoindex.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-autoindex.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-autoindex.xml -- 2.5.5

2 5

[libvirt] [PATCH 0/2] Add virFirmware object for use by driver config
by Jim Fehlig 25 May '16

25 May '16

While refreshing and testing my series to add domain capabilities and UEFI support to the libxl driver [1], I realized it would be useful to support the '--with-loader-nvram' configure option as well. This would allow users/packagers to specify system-provided firmwares instead of those provided by the Xen installation. Instead of copying code from the qemu driver, I decided to create a virFirmware object containing the firmware name (loader) and associated nvram, along with a few operations on the object. Patch1 introduces the object in src/util/virfirmware.[ch] and switches the qemu driver to use. The patch could be split along those lines, but I thought it would be review-friendly to see the movement of code in a single patch. But it can be split if preferred. Patch2 adds virFirmware to the libxl driver config. It is unused in this series, but if this approach is aggreable it will be used when rebasing the domain capabilities series. Note that currently Xen does not support storage for non-volitile variables for UEFI firmware (OVMF), so 'nvram' will be unused for the time being. Adding a 'nvram' option to libxl.conf can be deferred until support is added to Xen. But even with this limitation, folks are using UEFI + HVM guests with xl/libxl and would like to do the same with libvirt. Patch1 is a lot of code movement to avoid copying virQEMUDriverConfigLoaderNVRAMParse (and eventually virQEMUDriverConfigNVRAMParse). But I've complained about copy/paste in some of my recent reviews and shouldn't be doing the same in my own patches :-). [1] https://www.redhat.com/archives/libvir-list/2016-April/msg01358.html Jim Fehlig (2): driver config: Introduce virFirmware object libxl: add default firmwares to driver config object po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt_private.syms | 6 ++ src/libxl/libxl_conf.c | 21 +++++++ src/libxl/libxl_conf.h | 4 ++ src/qemu/qemu_capabilities.c | 22 +++---- src/qemu/qemu_capabilities.h | 5 +- src/qemu/qemu_conf.c | 127 ++++++---------------------------------- src/qemu/qemu_conf.h | 7 +-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 6 +- src/util/virfirmware.c | 135 +++++++++++++++++++++++++++++++++++++++++++ src/util/virfirmware.h | 51 ++++++++++++++++ tests/domaincapstest.c | 3 +- 14 files changed, 260 insertions(+), 131 deletions(-) create mode 100644 src/util/virfirmware.c create mode 100644 src/util/virfirmware.h -- 2.1.4

2 9