- Devel - libvirt List Archives

[libvirt] [PATCH 0/4] qemu: handle ',' and '=' in VM names
by Cole Robinson 23 Apr '16

23 Apr '16

This series adds qemu cli comma escaping to several places that are dependent on the VM name, to enable names with embedded commas. Patch 4 makes use of qemu -name guest=X value to allow names with '=' in them. There's likely other places that are VM name dependent that need escaping too, but this hits the mandatory ones. I'm going to through the remaining list on the BiteSizedTasks page Cole Robinson (4): qemu: command: escape commas in VM name qemu: command: escape commas in secret master path qemu: command: escape commas in chardev socket path qemu: command: Use -name guest= if available src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 22 ++++++++++++-------- tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + .../qemuxml2argvdata/qemuxml2argv-name-escape.args | 24 ++++++++++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-name-escape.xml | 18 ++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 10 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-name-escape.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-name-escape.xml -- 2.7.3

2 6

[libvirt] [PATCH] vbox: VIR_WARN if we don't support the API version
by Cole Robinson 23 Apr '16

23 Apr '16

We presently don't give any indication if the VirtualBox version isn't in our support whitelist. --- src/vbox/vbox_common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 0cead10..50ebdba 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -7856,7 +7856,11 @@ virHypervisorDriverPtr vboxGetHypervisorDriver(uint32_t uVersion) /* Install gVBoxAPI according to the vbox API version. */ int result = 0; installUniformedAPI(gVBoxAPI, result); - if (result < 0) return NULL; + if (result < 0) { + VIR_WARN(_("Libvirt doesn't support VirtualBox API version %u"), + uVersion); + return NULL; + } updateDriver(); return &vboxCommonDriver; } -- 2.7.3

2 1

[libvirt] [RFC] move host uuid out of libvirtd.conf (effectively)
by Nikolay Shirokovskiy 22 Apr '16

22 Apr '16

Hi, all. I hope RFC flow from me are not hitting some rate limiting. Integration tests in our compary undercover that host uuid provided thru dmi is not as unique as it should be. This is probably a manufacturer mistake but still the case. Here libvirt's config field host uuid comes to the rescue. It is a good option in case of tweaking a few machines. In case of full-fledged mgmt it is probably enough too. But in case your managment is managment of packages thru you package manager it is not that convinent. The problem is that if one generates uuid on package install then package update will not be easy. One probably wants for updates to go smoothly in case user does not tweak anything but now it is not possible as changing host uuid is visible as user intervention by package managment. I'm talking now from my rpm based managment experience but I imagine this could be no different in other packaging systems too. This is probably could be overcomed thru some kind of reserse patching before update and patching again after if package system is wise enougth to check file hashes and not timestamps for example. But then this is should be done in this and every packaging system. So my proposition is simple - make it possible to take host uuid from distinct file. I think keeping uuid could be the sole purpuse of it. Then we can generate uuid on package installation and later updates need no any extra actions at all. Another benefit of keeping uuid in distinct place is that one can just copy daemon configuration to a different host not being aware it needs to be changed.

2 1

[libvirt] [PATCH v2] docs: Add bold style for <dt><code> elements
by John Ferlan 22 Apr '16

22 Apr '16

Add bolding for <dt><code> elements to make them "stick out" on the page rather that just a stream of text where the elements only differ by slightly different font style. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Based on Andrea's feedback to my v1 patch: http://www.redhat.com/archives/libvir-list/2016-April/msg01450.html Also considered adding "color: rgb(256,0,0);" to really make them pop out, but then thought that could lead down the treacherous path of customized color on pages (besides, for those red colorblind folks it's a no win) docs/generic.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/generic.css b/docs/generic.css index 208e31e..ac39f32 100644 --- a/docs/generic.css +++ b/docs/generic.css @@ -27,6 +27,10 @@ dt { margin-right: 2em; } +dt code { + font-weight: bold; +} + dl dd { margin-left: 2em; margin-right: 2em; -- 2.5.5

2 1

[libvirt] [PATCH] apibuild: Turn hidden_macros into array
by Michal Privoznik 22 Apr '16

22 Apr '16

This is an array, not a hash table. It makes no problem with newer pythons, but with python2.6 it is a problem: File "../../docs/apibuild.py", line 117 "VIR_DEPRECATED", # internal macro to mark deprecated apis ^ SyntaxError: invalid syntax Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/apibuild.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 9c82c4a..d065d56 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -113,10 +113,10 @@ ignored_macros = { } # macros that should be completely skipped -hidden_macros = { +hidden_macros = [ "VIR_DEPRECATED", # internal macro to mark deprecated apis "VIR_EXPORT_VAR", # internal macro to mark exported vars -} +] def escape(raw): raw = string.replace(raw, '&', '&') -- 2.7.3

2 4

[libvirt] [PATCH] docs: apibuild: Fix for python 2.6
by Peter Krempa 22 Apr '16

22 Apr '16

Ancient python didn't like the new list added in 99283874. Convert it to a dict. --- Pushed under the build breaker rule. docs/apibuild.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 9c82c4a..8882759 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -114,8 +114,8 @@ ignored_macros = { # macros that should be completely skipped hidden_macros = { - "VIR_DEPRECATED", # internal macro to mark deprecated apis - "VIR_EXPORT_VAR", # internal macro to mark exported vars + "VIR_DEPRECATED": "internal macro to mark deprecated apis", + "VIR_EXPORT_VAR": "internal macro to mark exported vars", } def escape(raw): -- 2.8.1

2 2

[libvirt] migration: why did we choose port 49152-49215 for migration as default?
by Zhangbo (Oscar) 22 Apr '16

22 Apr '16

Hi all: As we know, "32768~61000" are random ports reserved for customized use. 49152-49215 is in that range. We think that setting migration port into this range, is a little risky. Because other applications may have already taken these ports before we migrate a guest, then the migration job would fail. So, why did we choose "49152-49215" as the default port range for migration, any specific purpose? Thanks in advance. Oscar.

2 1

[libvirt] [PATCH] vz: make more accurate closing connection to sdk
by Nikolay Shirokovskiy 22 Apr '16

22 Apr '16

Current code for example can call unsubscribe if connection succeeds but subscribing fails. This will probabaly lead only to spurious error messages without any actual inconsistencies but nevertheless. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- NOTE!!! this patch is applied on top of migration series src/vz/vz_driver.c | 9 ++------ src/vz/vz_sdk.c | 65 +++++++++++++++++++++++++++--------------------------- src/vz/vz_sdk.h | 2 -- 3 files changed, 34 insertions(+), 42 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 8264ac0..1e56837 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -160,11 +160,7 @@ static void vzDriverDispose(void * obj) { vzDriverPtr driver = obj; - if (driver->server) { - prlsdkUnsubscribeFromPCSEvents(driver); - prlsdkDisconnect(driver); - } - + prlsdkDisconnect(driver); virObjectUnref(driver->domains); virObjectUnref(driver->caps); virObjectUnref(driver->xmlopt); @@ -318,8 +314,7 @@ vzDriverObjNew(void) !(driver->domains = virDomainObjListNew()) || !(driver->domainEventState = virObjectEventStateNew()) || (vzInitVersion(driver) < 0) || - (prlsdkConnect(driver) < 0) || - (prlsdkSubscribeToPCSEvents(driver) < 0) + (prlsdkConnect(driver) < 0) ) { virObjectUnref(driver); return NULL; diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index a96fc96..5b425d7 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -39,6 +39,8 @@ static int prlsdkUUIDParse(const char *uuidstr, unsigned char *uuid); +static PRL_RESULT +prlsdkEventsHandler(PRL_HANDLE prlEvent, PRL_VOID_PTR opaque); VIR_LOG_INIT("parallels.sdk"); @@ -284,41 +286,62 @@ prlsdkConnect(vzDriverPtr driver) job = PrlSrv_LoginLocalEx(driver->server, NULL, 0, PSL_HIGH_SECURITY, PACF_NON_INTERACTIVE_MODE); if (PRL_FAILED(getJobResult(job, &result))) - goto cleanup; + goto destroy; pret = PrlResult_GetParam(result, &response); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetGoto(pret, logoff); pret = prlsdkGetStringParamBuf(PrlLoginResponse_GetSessionUuid, response, session_uuid, sizeof(session_uuid)); - prlsdkCheckRetGoto(pret, cleanup); + prlsdkCheckRetGoto(pret, logoff); if (prlsdkUUIDParse(session_uuid, driver->session_uuid) < 0) - goto cleanup; + goto logoff; + + pret = PrlSrv_RegEventHandler(driver->server, + prlsdkEventsHandler, + driver); + prlsdkCheckRetGoto(pret, logoff); ret = 0; cleanup: - if (ret < 0) { - PrlHandle_Free(driver->server); - driver->server = PRL_INVALID_HANDLE; - } - PrlHandle_Free(result); PrlHandle_Free(response); return ret; + + logoff: + job = PrlSrv_Logoff(driver->server); + waitJob(job); + + destroy: + PrlHandle_Free(driver->server); + driver->server = PRL_INVALID_HANDLE; + + goto cleanup; } void prlsdkDisconnect(vzDriverPtr driver) { PRL_HANDLE job; + PRL_RESULT ret; + + if (driver->server == PRL_INVALID_HANDLE) + return; + + ret = PrlSrv_UnregEventHandler(driver->server, + prlsdkEventsHandler, + driver); + if (PRL_FAILED(ret)) + logPrlError(ret); job = PrlSrv_Logoff(driver->server); waitJob(job); PrlHandle_Free(driver->server); + driver->server = PRL_INVALID_HANDLE; } static int @@ -1951,30 +1974,6 @@ prlsdkEventsHandler(PRL_HANDLE prlEvent, PRL_VOID_PTR opaque) return PRL_ERR_SUCCESS; } -int prlsdkSubscribeToPCSEvents(vzDriverPtr driver) -{ - PRL_RESULT pret = PRL_ERR_UNINITIALIZED; - - pret = PrlSrv_RegEventHandler(driver->server, - prlsdkEventsHandler, - driver); - prlsdkCheckRetGoto(pret, error); - return 0; - - error: - return -1; -} - -void prlsdkUnsubscribeFromPCSEvents(vzDriverPtr driver) -{ - PRL_RESULT ret = PRL_ERR_UNINITIALIZED; - ret = PrlSrv_UnregEventHandler(driver->server, - prlsdkEventsHandler, - driver); - if (PRL_FAILED(ret)) - logPrlError(ret); -} - PRL_RESULT prlsdkStart(PRL_HANDLE sdkdom) { PRL_HANDLE job = PRL_INVALID_HANDLE; diff --git a/src/vz/vz_sdk.h b/src/vz/vz_sdk.h index 3d27d12..757e174 100644 --- a/src/vz/vz_sdk.h +++ b/src/vz/vz_sdk.h @@ -34,8 +34,6 @@ int prlsdkUpdateDomain(vzDriverPtr driver, virDomainObjPtr dom); int prlsdkLoadDomain(vzDriverPtr driver, virDomainObjPtr dom); -int prlsdkSubscribeToPCSEvents(vzDriverPtr driver); -void prlsdkUnsubscribeFromPCSEvents(vzDriverPtr driver); PRL_RESULT prlsdkStart(PRL_HANDLE sdkdom); PRL_RESULT prlsdkKill(PRL_HANDLE sdkdom); PRL_RESULT prlsdkStop(PRL_HANDLE sdkdom); -- 1.8.3.1

1 0

[libvirt] [PATCH] docs: remove reference to non-existent "igmp-ipv6" protocol
by Laine Stump 22 Apr '16

22 Apr '16

IGMP is used on IPv4 networks set setup multicast group memberships. On IPv6, this job is done by Multicast Listener Discovery (MLD), which uses ICMPv6 packets rather than using its own IP protocol number. The nwfilter documentation lists "igmp-ipv6" as one of the possible protocols, but this is ignored (and stripped from the xml). This patch removes that erroneous reference. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1038888 --- docs/formatnwfilter.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 4a60e2e..d1e5d31 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -1781,7 +1781,7 @@ <h5><a name="nwfelemsRulesProtoMiscv6">IGMP, ESP, AH, UDPLITE, 'ALL' over IPv6</a></h5> - Protocol ID: <code>igmp-ipv6</code>, <code>esp-ipv6</code>, <code>ah-ipv6</code>, <code>udplite-ipv6</code>, <code>all-ipv6</code> + Protocol ID: <code>esp-ipv6</code>, <code>ah-ipv6</code>, <code>udplite-ipv6</code>, <code>all-ipv6</code> Note: The chain parameter is ignored for this type of traffic and should either be omitted or set to <code>root</code>. -- 2.5.5

3 2

[libvirt] [RFC] changing/regenerating domain uuid on migration
by Nikolay Shirokovskiy 22 Apr '16

22 Apr '16

Hi all. Consider next usecase. There are active domain DA on host A and active domain DB on host B and the uuids of domains are the same. This is quite uncommon of course but still possible. If we have option to change uuid on migration then migration of DA to host B is possible and if we don't have the option we have to stop/edit/start DA to migrate. What is you opinion on subject? Can this functionality be taken into upstream and in what form? In form of setting uuid as a migration parameter or option to regenerate uuid on destination? Nikolay

3 3

[libvirt] [RFC] relax offline migration requirements to --xml
by Nikolay Shirokovskiy 22 Apr '16

22 Apr '16

Hi, all. I'm thinking of leveraging of existing migration API to support offline clone in virtuozzo. AFAIK offline migration is basically just copying of domain config to the other side and defining it there. It is even possible to slightly mutate it thru options like --dname or --xml but mutation restrictions are the same as in case of active domain migration which is quite tight for an offline clone case. In case of clone we want to change uuid, MACs etc. Well the changes itself could be done by mgmt but this requires that libvirt drops the restictive checks for --xml option. What is your evaluation of this approach? Nikolay

2 2

[libvirt] [PATCH] qemu: Limit maximum block device I/O tune values
by Martin Kletzander 22 Apr '16

22 Apr '16

The values are currently limited to LLONG_MAX which causes some problems. QEMU conveniently changed their maximum to 1e15 (1 PB) which is enough for some time and we need to adapt to that so that we don't throw "Unknown error" messages. Strictly limiting these values actually fixes some corner case values (off-by-one checks in QEMU probably). Since values out of the new specified range do not overflow anything, change the type of error as well. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1317531 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_command.c | 30 +++++++++++++++--------------- src/qemu/qemu_command.h | 2 ++ src/qemu/qemu_driver.c | 6 +++--- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2fb967acbfe8..ef4a62dafb5b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1394,22 +1394,22 @@ qemuBuildDriveStr(virConnectPtr conn, goto error; } - if (disk->blkdeviotune.total_bytes_sec > LLONG_MAX || - disk->blkdeviotune.read_bytes_sec > LLONG_MAX || - disk->blkdeviotune.write_bytes_sec > LLONG_MAX || - disk->blkdeviotune.total_iops_sec > LLONG_MAX || - disk->blkdeviotune.read_iops_sec > LLONG_MAX || - disk->blkdeviotune.write_iops_sec > LLONG_MAX || - disk->blkdeviotune.total_bytes_sec_max > LLONG_MAX || - disk->blkdeviotune.read_bytes_sec_max > LLONG_MAX || - disk->blkdeviotune.write_bytes_sec_max > LLONG_MAX || - disk->blkdeviotune.total_iops_sec_max > LLONG_MAX || - disk->blkdeviotune.read_iops_sec_max > LLONG_MAX || - disk->blkdeviotune.write_iops_sec_max > LLONG_MAX || - disk->blkdeviotune.size_iops_sec > LLONG_MAX) { - virReportError(VIR_ERR_OVERFLOW, + if (disk->blkdeviotune.total_bytes_sec > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.read_bytes_sec > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.write_bytes_sec > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.total_iops_sec > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.read_iops_sec > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.write_iops_sec > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.total_bytes_sec_max > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.read_bytes_sec_max > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.write_bytes_sec_max > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.total_iops_sec_max > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.read_iops_sec_max > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.write_iops_sec_max > QEMU_BLOCK_IOTUNE_MAX || + disk->blkdeviotune.size_iops_sec > QEMU_BLOCK_IOTUNE_MAX) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("block I/O throttle limit must " - "be less than %llu using QEMU"), LLONG_MAX); + "be less than %llu using QEMU"), QEMU_BLOCK_IOTUNE_MAX); goto error; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 2e2f133ac341..1e9ce6690603 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -40,6 +40,8 @@ # define QEMU_DRIVE_HOST_PREFIX "drive-" # define QEMU_FSDEV_HOST_PREFIX "fsdev-" +# define QEMU_BLOCK_IOTUNE_MAX 1000000000000000LL + VIR_ENUM_DECL(qemuVideo) char *qemuBuildObjectCommandlineFromJSON(const char *type, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 055f0714ddf3..90f541cf6d74 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17526,10 +17526,10 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; - if (param->value.ul > LLONG_MAX) { - virReportError(VIR_ERR_OVERFLOW, + if (param->value.ul > QEMU_BLOCK_IOTUNE_MAX) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("block I/O throttle limit value must" - " be less than %llu"), LLONG_MAX); + " be less than %llu"), QEMU_BLOCK_IOTUNE_MAX); goto endjob; } -- 2.8.1

2 2

[libvirt] [PATCH v2] virconf: Handle conf file without ending newline
by Cole Robinson 21 Apr '16

21 Apr '16

$ echo -n 'log_level=1' > ~/.config/libvirt/libvirtd.conf $ libvirtd --timeout=10 2014-10-10 10:30:56.394+0000: 6626: info : libvirt version: 1.1.3.6, package: 1.fc20 (Fedora Project, 2014-09-08-17:50:42, buildvm-05.phx2.fedoraproject.org) 2014-10-10 10:30:56.394+0000: 6626: error : main:1261 : Can't load config file: configuration file syntax error: /home/rjones/.config/libvirt/libvirtd.conf:1: expecting a value: /home/rjones/.config/libvirt/libvirtd.conf Rather than try to fix this in the depths of the parser, just catch the case when a config file doesn't end in a newline, and manually append a newline to the content before parsing https://bugzilla.redhat.com/show_bug.cgi?id=1151409 --- v2: Properly NULL deliminate string (thanks pkrempa) Hey, there's a virconf test suite. Add a new test case src/util/virconf.c | 11 ++++++++++- tests/confdata/no-newline.conf | 1 + tests/confdata/no-newline.out | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 tests/confdata/no-newline.conf create mode 100644 tests/confdata/no-newline.out diff --git a/src/util/virconf.c b/src/util/virconf.c index 5915bc2..7c98588 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -765,7 +765,7 @@ virConfReadFile(const char *filename, unsigned int flags) { char *content; int len; - virConfPtr conf; + virConfPtr conf = NULL; VIR_DEBUG("filename=%s", NULLSTR(filename)); @@ -777,8 +777,17 @@ virConfReadFile(const char *filename, unsigned int flags) if ((len = virFileReadAll(filename, MAX_CONFIG_FILE_SIZE, &content)) < 0) return NULL; + if (len && len < MAX_CONFIG_FILE_SIZE && content[len - 1] != '\n') { + VIR_DEBUG("appending newline to busted config file %s", filename); + if (VIR_REALLOC_N(content, len + 1) < 0) + goto cleanup; + content[len++] = '\n'; + content[len] = '\0'; + } + conf = virConfParse(filename, content, len, flags); + cleanup: VIR_FREE(content); return conf; diff --git a/tests/confdata/no-newline.conf b/tests/confdata/no-newline.conf new file mode 100644 index 0000000..77e082e --- /dev/null +++ b/tests/confdata/no-newline.conf @@ -0,0 +1 @@ +log_level=1 \ No newline at end of file diff --git a/tests/confdata/no-newline.out b/tests/confdata/no-newline.out new file mode 100644 index 0000000..c001761 --- /dev/null +++ b/tests/confdata/no-newline.out @@ -0,0 +1 @@ +log_level = 1 -- 2.7.3

2 2

[libvirt] [PATCH] network: fix DHCPv6 on networks with prefix != 64
by Laine Stump 21 Apr '16

21 Apr '16

According to the dnsmasq manpage, the netmask for IPv4 address ranges will be auto-deteremined from the interface dnsmasq is listening on, but it can't do this for IPv6 for some reason - it instead assumes a network prefix of 64 for all IPv6 address ranges. If this is incorrect, dnsmasq will refuse to give out an address to clients, instead logging this message: dnsmasq-dhcp[2380]: no address range available for DHCPv6 request via virbr0 The solution is for libvirt to add ",$prefix" to all IPv6 dhcp-range arguments when building the dnsmasq.conf file. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1033739 --- src/network/bridge_driver.c | 21 +++++++++++++++++++-- tests/networkxml2confdata/dhcp6-nat-network.conf | 2 +- tests/networkxml2confdata/dhcp6-network.conf | 2 +- .../dhcp6host-routed-network.conf | 2 +- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 73236ff..29c5feb 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1180,6 +1180,15 @@ networkDnsmasqConfContents(virNetworkObjPtr network, ipdef = ipv4def ? ipv4def : ipv6def; while (ipdef) { + int prefix; + + prefix = virNetworkIpDefPrefix(ipdef); + if (prefix < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("bridge '%s' has an invalid prefix"), + network->def->bridge); + goto cleanup; + } for (r = 0; r < ipdef->nranges; r++) { int thisRange; @@ -1187,8 +1196,12 @@ networkDnsmasqConfContents(virNetworkObjPtr network, !(eaddr = virSocketAddrFormat(&ipdef->ranges[r].end))) goto cleanup; - virBufferAsprintf(&configbuf, "dhcp-range=%s,%s\n", + virBufferAsprintf(&configbuf, "dhcp-range=%s,%s", saddr, eaddr); + if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) + virBufferAsprintf(&configbuf, ",%d", prefix); + virBufferAddLit(&configbuf, "\n"); + VIR_FREE(saddr); VIR_FREE(eaddr); thisRange = virSocketAddrGetRange(&ipdef->ranges[r].start, @@ -1210,7 +1223,11 @@ networkDnsmasqConfContents(virNetworkObjPtr network, char *bridgeaddr = virSocketAddrFormat(&ipdef->address); if (!bridgeaddr) goto cleanup; - virBufferAsprintf(&configbuf, "dhcp-range=%s,static\n", bridgeaddr); + virBufferAsprintf(&configbuf, "dhcp-range=%s,static", + bridgeaddr); + if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) + virBufferAsprintf(&configbuf, ",%d", prefix); + virBufferAddLit(&configbuf, "\n"); VIR_FREE(bridgeaddr); } diff --git a/tests/networkxml2confdata/dhcp6-nat-network.conf b/tests/networkxml2confdata/dhcp6-nat-network.conf index 922eb7a..17076b8 100644 --- a/tests/networkxml2confdata/dhcp6-nat-network.conf +++ b/tests/networkxml2confdata/dhcp6-nat-network.conf @@ -10,7 +10,7 @@ bind-dynamic interface=virbr0 dhcp-range=192.168.122.2,192.168.122.254 dhcp-no-override -dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff +dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64 dhcp-lease-max=493 dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/dhcp6-network.conf b/tests/networkxml2confdata/dhcp6-network.conf index 064515f..8270690 100644 --- a/tests/networkxml2confdata/dhcp6-network.conf +++ b/tests/networkxml2confdata/dhcp6-network.conf @@ -10,7 +10,7 @@ expand-hosts except-interface=lo bind-dynamic interface=virbr0 -dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff +dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64 dhcp-lease-max=240 dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/dhcp6host-routed-network.conf b/tests/networkxml2confdata/dhcp6host-routed-network.conf index ad6db36..5728ee4 100644 --- a/tests/networkxml2confdata/dhcp6host-routed-network.conf +++ b/tests/networkxml2confdata/dhcp6host-routed-network.conf @@ -10,7 +10,7 @@ bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static dhcp-no-override -dhcp-range=2001:db8:ac10:fd01::1,static +dhcp-range=2001:db8:ac10:fd01::1,static,64 dhcp-hostsfile=/var/lib/libvirt/dnsmasq/local.hostsfile addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts enable-ra -- 2.5.5

2 1

[libvirt] [PATCH] docs: Use <code> inside <dt> for symbols
by Andrea Bolognani 21 Apr '16

21 Apr '16

Most of the time, the <dt> tag is used when providing documentation for a symbol; enclose symbols in <code> tags to style them appropriately. --- docs/auditlog.html.in | 142 +++++++++++++++++++++--------------------- docs/drvlxc.html.in | 16 ++--- docs/formatcaps.html.in | 26 ++++---- docs/formatdomain.html.in | 18 +++--- docs/formatdomaincaps.html.in | 32 +++++----- docs/locking.html.in | 6 +- docs/remote.html.in | 12 ++-- 7 files changed, 126 insertions(+), 126 deletions(-) diff --git a/docs/auditlog.html.in b/docs/auditlog.html.in index 8a007ca..012d068 100644 --- a/docs/auditlog.html.in +++ b/docs/auditlog.html.in @@ -57,13 +57,13 @@ <dl> - <dt>pid</dt> + <dt><code>pid</code></dt> <dd>Process ID of the libvirtd daemon generating the audit record.</dd> - <dt>uid</dt> + <dt><code>uid</code></dt> <dd>User ID of the libvirtd daemon process generating the audit record.</dd> - <dt>subj</dt> + <dt><code>subj</code></dt> <dd>Security context of the libvirtd daemon process generating the audit record.</dd> - <dt>msg</dt> + <dt><code>msg</code></dt> <dd>String containing a list of key=value pairs specific to the type of audit record being reported.</dd> </dl> @@ -72,21 +72,21 @@ <dl> - <dt>virt</dt> + <dt><code>virt</code></dt> <dd>Type of virtualization driver used. One of <code>qemu</code> or <code>lxc</code></dd> - <dt>vm</dt> + <dt><code>vm</code></dt> <dd>Host driver unique name of the guest</dd> - <dt>uuid</dt> + <dt><code>uuid</code></dt> <dd>Globally unique identifier for the guest</dd> - <dt>exe</dt> + <dt><code>exe</code></dt> <dd>Path of the libvirtd daemon</dd> - <dt>hostname</dt> + <dt><code>hostname</code></dt> <dd>Currently unused</dd> - <dt>addr</dt> + <dt><code>addr</code></dt> <dd>Currently unused</dd> - <dt>terminal</dt> + <dt><code>terminal</code></dt> <dd>Currently unused</dd> - <dt>res</dt> + <dt><code>res</code></dt> <dd>Result of the action, either <code>success</code> or <code>failed</code></dd> </dl> @@ -98,15 +98,15 @@ <dl> - <dt>op</dt> + <dt><code>op</code></dt> <dd>Type of operation performed. One of <code>start</code>, <code>stop</code> or <code>init</code></dd> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the operation to happen</dd> - <dt>vm-pid</dt> + <dt><code>vm-pid</code></dt> <dd>ID of the primary/leading process associated with the guest</dd> - <dt>init-pid</dt> + <dt><code>init-pid</code></dt> <dd>ID of the <code>init</code> process in a container. Only if <code>op=init</code> and <code>virt=lxc</code></dd> - <dt>pid-ns</dt> + <dt><code>pid-ns</code></dt> <dd>Namespace ID of the <code>init</code> process in a container. Only if <code>op=init</code> and <code>virt=lxc</code></dd> </dl> @@ -118,11 +118,11 @@ <dl> - <dt>model</dt> + <dt><code>model</code></dt> <dd>The security driver type. One of <code>selinux</code> or <code>apparmor</code></dd> - <dt>vm-ctx</dt> + <dt><code>vm-ctx</code></dt> <dd>Security context for the guest process</dd> - <dt>img-ctx</dt> + <dt><code>img-ctx</code></dt> <dd>Security context for the guest disk images and other assigned host resources</dd> </dl> @@ -144,13 +144,13 @@ <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>vcpu</code></dd> - <dt>old-vcpu</dt> + <dt><code>old-vcpu</code></dt> <dd>Original vCPU count, or 0</dd> - <dt>new-vcpu</dt> + <dt><code>new-vcpu</code></dt> <dd>Updated vCPU count</dd> </dl> @@ -162,13 +162,13 @@ <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>mem</code></dd> - <dt>old-mem</dt> + <dt><code>old-mem</code></dt> <dd>Original memory size in bytes, or 0</dd> - <dt>new-mem</dt> + <dt><code>new-mem</code></dt> <dd>Updated memory size in bytes</dd> </dl> @@ -178,13 +178,13 @@ <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>disk</code></dd> - <dt>old-disk</dt> + <dt><code>old-disk</code></dt> <dd>Original host file or device path acting as the disk backing file</dd> - <dt>new-disk</dt> + <dt><code>new-disk</code></dt> <dd>Updated host file or device path acting as the disk backing file</dd> </dl> @@ -195,13 +195,13 @@ <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>net</code></dd> - <dt>old-net</dt> + <dt><code>old-net</code></dt> <dd>Original MAC address of the guest network interface</dd> - <dt>new-net</dt> + <dt><code>new-net</code></dt> <dd>Updated MAC address of the guest network interface</dd> </dl> @@ -211,13 +211,13 @@ <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>net</code></dd> - <dt>net</dt> + <dt><code>net</code></dt> <dd>MAC address of the host network interface</dd> - <dt>rdev</dt> + <dt><code>rdev</code></dt> <dd>Name of the host network interface</dd> </dl> @@ -227,13 +227,13 @@ <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>fs</code></dd> - <dt>old-fs</dt> + <dt><code>old-fs</code></dt> <dd>Original host directory, file or device path backing the filesystem </dd> - <dt>new-fs</dt> + <dt><code>new-fs</code></dt> <dd>Updated host directory, file or device path backing the filesystem</dd> </dl> @@ -243,15 +243,15 @@ <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>hostdev</code> or <code>dev</code></dd> - <dt>dev</dt> + <dt><code>dev</code></dt> <dd>The unique bus identifier of the USB, PCI or SCSI device, if <code>resrc=dev</code></dd> - <dt>disk</dt> + <dt><code>disk</code></dt> <dd>The path of the block device assigned to the guest, if <code>resrc=hostdev</code></dd> - <dt>chardev</dt> + <dt><code>chardev</code></dt> <dd>The path of the character device assigned to the guest, if <code>resrc=hostdev</code></dd> </dl> @@ -261,11 +261,11 @@ <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>tpm</code></dd> - <dt>device</dt> + <dt><code>device</code></dt> <dd>The path of the host TPM device assigned to the guest</dd> </dl> @@ -275,13 +275,13 @@ <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>rng</code></dd> - <dt>old-rng</dt> + <dt><code>old-rng</code></dt> <dd>Original path of the host entropy source for the RNG</dd> - <dt>new-rng</dt> + <dt><code>new-rng</code></dt> <dd>Updated path of the host entropy source for the RNG</dd> </dl> @@ -291,13 +291,13 @@ <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>chardev</code></dd> - <dt>old-chardev</dt> + <dt><code>old-chardev</code></dt> <dd>Original path of the backing character device for given emulated device</dd> - <dt>new-chardev</dt> + <dt><code>new-chardev</code></dt> <dd>Updated path of the backing character device for given emulated device</dd> </dl> @@ -307,15 +307,15 @@ <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>smartcard</code></dd> - <dt>old-smartcard</dt> + <dt><code>old-smartcard</code></dt> <dd>Original path of the backing character device, certificate store or "nss-smartcard-device" for host smartcard passthrough. </dd> - <dt>new-smartcard</dt> + <dt><code>new-smartcard</code></dt> <dd>Updated path of the backing character device, certificate store or "nss-smartcard-device" for host smartcard passthrough. </dd> @@ -327,13 +327,13 @@ <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>redir</code></dd> - <dt>bus</dt> + <dt><code>bus</code></dt> <dd>The bus type, only <code>usb</code> allowed</dd> - <dt>device</dt> + <dt><code>device</code></dt> <dd>The device type, only <code>USB redir</code> allowed</dd> </dl> @@ -344,11 +344,11 @@ <dl> - <dt>reason</dt> + <dt><code>reason</code></dt> <dd>The reason which caused the resource to be assigned to happen</dd> - <dt>resrc</dt> + <dt><code>resrc</code></dt> <dd>The type of resource assigned. Set to <code>cgroup</code></dd> - <dt>cgroup</dt> + <dt><code>cgroup</code></dt> <dd>The name of the cgroup controller</dd> </dl> diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index d6c57c4..3dc9d59 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -80,15 +80,15 @@ to be provided by all container technologies on Linux. <dl> -<dt>container</dt> +<dt><code>container</code></dt> <dd>The fixed string <code>libvirt-lxc</code> to identify libvirt as the creator</dd> -<dt>container_uuid</dt> +<dt><code>container_uuid</code></dt> <dd>The UUID assigned to the container by libvirt</dd> -<dt>PATH</dt> +<dt><code>PATH</code></dt> <dd>The fixed string <code>/bin:/usr/bin</code></dd> -<dt>TERM</dt> +<dt><code>TERM</code></dt> <dd>The fixed string <code>linux</code></dd> -<dt>HOME</dt> +<dt><code>HOME</code></dt> <dd>The fixed string <code>/</code></dd> </dl> @@ -98,11 +98,11 @@ environment variables are also provided <dl> -<dt>LIBVIRT_LXC_NAME</dt> +<dt><code>LIBVIRT_LXC_NAME</code></dt> <dd>The name assigned to the container by libvirt</dd> -<dt>LIBVIRT_LXC_UUID</dt> +<dt><code>LIBVIRT_LXC_UUID</code></dt> <dd>The UUID assigned to the container by libvirt</dd> -<dt>LIBVIRT_LXC_CMDLINE</dt> +<dt><code>LIBVIRT_LXC_CMDLINE</code></dt> <dd>The unparsed command line arguments specified in the container configuration. Use of this is discouraged, in favour of passing arguments directly to the container init process via the <code>initarg</code> config element.</dd> diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in index c187187..0ba567c 100644 --- a/docs/formatcaps.html.in +++ b/docs/formatcaps.html.in @@ -73,19 +73,19 @@ <dd>This expresses what kind of operating system the hypervisor is able to run. Possible values are: <dl> - <dt>xen</dt> + <dt><code>xen</code></dt> <dd>for XEN</dd> - <dt>linux</dt> + <dt><code>linux</code></dt> <dd>legacy alias for <code>xen</code></dd> - <dt>hvm</dt> + <dt><code>hvm</code></dt> <dd>Unmodified operating system</dd> - <dt>exe</dt> + <dt><code>exe</code></dt> <dd>Container based virtualization</dd> - <dt>uml</dt> + <dt><code>uml</code></dt> <dd>User Mode Linux</dd> </dl> </dd> @@ -97,37 +97,37 @@ <dd>This optional element encases possible features that can be used with a guest of described type. Possible subelements are: <dl> - <dt>pae</dt><dd>If present, 32-bit guests can use PAE + <dt><code>pae</code></dt><dd>If present, 32-bit guests can use PAE address space extensions, since 0.4.1</dd> - <dt>nonpae</dt><dd>If present, 32-bit guests can be run + <dt><code>nonpae</code></dt><dd>If present, 32-bit guests can be run without requiring PAE, since 0.4.1</dd> - <dt>ia64_be</dt><dd>If present, IA64 guests can be run in + <dt><code>ia64_be</code></dt><dd>If present, IA64 guests can be run in big-endian mode, since 0.4.1</dd> - <dt>acpi</dt><dd>If this element is present, + <dt><code>acpi</code></dt><dd>If this element is present, the <code>default</code> attribute describes whether the hypervisor exposes ACPI to the guest by default, and the <code>toggle</code> attribute describes whether the user can override this default. Since 0.4.1</dd> - <dt>apic</dt><dd>If this element is present, + <dt><code>apic</code></dt><dd>If this element is present, the <code>default</code> attribute describes whether the hypervisor exposes APIC to the guest by default, and the <code>toggle</code> attribute describes whether the user can override this default. Since 0.4.1</dd> - <dt>cpuselection</dt><dd>If this element is present, the + <dt><code>cpuselection</code></dt><dd>If this element is present, the hypervisor supports the <code><cpu></code> element within a domain definition for fine-grained control over the CPU presented to the guest. Since 0.7.5</dd> - <dt>deviceboot</dt><dd>If this element is present, + <dt><code>deviceboot</code></dt><dd>If this element is present, the <code><boot order='...'/></code> element can be used inside devices, rather than the older boot specification by category. Since 0.8.8</dd> - <dt>disksnapshot</dt><dd>If this element is present, + <dt><code>disksnapshot</code></dt><dd>If this element is present, the <code>default</code> attribute describes whether external disk snapshots are supported. If absent, external snapshots may still be supported, but it diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 895114b..a9c657d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3331,17 +3331,17 @@ ...</pre> <dl> - <dt>lockspace</dt> + <dt><code>lockspace</code></dt> <dd>This is an arbitrary string, identifying the lockspace within which the key is held. Lock managers may impose extra restrictions on the format, or length of the lockspace name.</dd> - <dt>key</dt> + <dt><code>key</code></dt> <dd>This is an arbitrary string, uniquely identifying the lease to be acquired. Lock managers may impose extra restrictions on the format, or length of the key. </dd> - <dt>target</dt> + <dt><code>target</code></dt> <dd>This is the fully qualified path of the file associated with the lockspace. The offset specifies where the lease is stored within the file. If the lock manager does not @@ -3429,12 +3429,12 @@ "subsystem" and the <code>type</code> is one of the following values with additional attributes noted. <dl> - <dt>usb</dt> + <dt><code>usb</code></dt> <dd>USB devices are detached from the host on guest startup and reattached after the guest exits or the device is hot-unplugged. </dd> - <dt>pci</dt> + <dt><code>pci</code></dt> <dd>For PCI devices, when <code>managed</code> is "yes" it is detached from the host before being passed on to the guest and reattached to the host after the guest exits. If @@ -3445,7 +3445,7 @@ (or <code>virsh nodedev-reattach</code>) after hot-unplug or stopping the guest. </dd> - <dt>scsi</dt> + <dt><code>scsi</code></dt> <dd>For SCSI devices, user is responsible to make sure the device is not used by host. If supported by the hypervisor and OS, the optional <code>sgio</code> (since 1.0.6) @@ -3472,7 +3472,7 @@ <dd>The source element describes the device as seen from the host using the following mechanism to describe: <dl> - <dt>usb</dt> + <dt><code>usb</code></dt> <dd>The USB device can either be addressed by vendor / product id using the <code>vendor</code> and <code>product</code> elements or by the device's address on the host using the @@ -3500,10 +3500,10 @@ </tr> </table> </dd> - <dt>pci</dt> + <dt><code>pci</code></dt> <dd>PCI devices can only be described by their <code>address</code>. </dd> - <dt>scsi</dt> + <dt><code>scsi</code></dt> <dd>SCSI devices are described by both the <code>adapter</code> and <code>address</code> elements. The <code>address</code> element includes a <code>bus</code> attribute (a 2-digit bus diff --git a/docs/formatdomaincaps.html.in b/docs/formatdomaincaps.html.in index 0c40321..edbb948 100644 --- a/docs/formatdomaincaps.html.in +++ b/docs/formatdomaincaps.html.in @@ -61,18 +61,18 @@ </domainCapabilities> </pre> <dl> - <dt>path</dt> + <dt><code>path</code></dt> <dd>The full path to the emulator binary.</dd> - <dt>domain</dt> + <dt><code>domain</code></dt> <dd>Describes the <a href="formatdomain.html#elements">virtualization type</a> (or so called domain type).</dd> - <dt>machine</dt> + <dt><code>machine</code></dt> <dd>The domain's <a href="formatdomain.html#elementsOSBIOS">machine type</a>.</dd> - <dt>arch</dt> + <dt><code>arch</code></dt> <dd>The domain's <a href="formatdomain.html#elementsOSBIOS"> architecture</a>.</dd> @@ -92,7 +92,7 @@ </pre> <dl> - <dt>vcpu</dt> + <dt><code>vcpu</code></dt> <dd>The maximum number of supported virtual CPUs</dd> </dl> @@ -126,18 +126,18 @@ For the <code>loader</code> element, the following can occur: <dl> - <dt>value</dt> + <dt><code>value</code></dt> <dd>List of known loader paths. Currently this is only used to advertise known locations of OVMF binaries for qemu. Binaries will only be listed if they actually exist on disk.</dd> - <dt>type</dt> + <dt><code>type</code></dt> <dd>Whether loader is a typical BIOS (<code>rom</code>) or an UEFI binary (<code>pflash</code>). This refers to <code>type</code> attribute of the <loader/> element.</dd> - <dt>readonly</dt> + <dt><code>readonly</code></dt> <dd>Options for the <code>readonly</code> attribute of the <loader/> element.</dd> </dl> @@ -207,11 +207,11 @@ </pre> <dl> - <dt>diskDevice</dt> + <dt><code>diskDevice</code></dt> <dd>Options for the <code>device</code> attribute of the <disk/> element.</dd> - <dt>bus</dt> + <dt><code>bus</code></dt> <dd>Options for the <code>bus</code> attribute of the <target/> element for a <disk/>.</dd> </dl> @@ -257,23 +257,23 @@ </pre> <dl> - <dt>mode</dt> + <dt><code>mode</code></dt> <dd>Options for the <code>mode</code> attribute of the <hostdev/> element.</dd> - <dt>startupPolicy</dt> + <dt><code>startupPolicy</code></dt> <dd>Options for the <code>startupPolicy</code> attribute of the <hostdev/> element.</dd> - <dt>subsysType</dt> + <dt><code>subsysType</code></dt> <dd>Options for the <code>type</code> attribute of the <hostdev/> element in case of <code>mode="subsystem"</code>.</dd> - <dt>capsType</dt> + <dt><code>capsType</code></dt> <dd>Options for the <code>type</code> attribute of the <hostdev/> element in case of <code>mode="capabilities"</code>.</dd> - <dt>pciBackend</dt> + <dt><code>pciBackend</code></dt> <dd>Options for the <code>name</code> attribute of the <driver/> element.</dd> </dl> @@ -313,7 +313,7 @@ GIC capabilities are exposed under the <code>gic</code> element. <dl> - <dt>version</dt> + <dt><code>version</code></dt> <dd>Options for the <code>version</code> attribute of the <code>gic</code> element.</dd> </dl> diff --git a/docs/locking.html.in b/docs/locking.html.in index c25ae85..aca1811 100644 --- a/docs/locking.html.in +++ b/docs/locking.html.in @@ -23,19 +23,19 @@ <dl> - <dt>nop</dt> + <dt><code>nop</code></dt> <dd>This is a "no op" implementation which does absolutely nothing. This can be used if mutual exclusion between virtual machines is not required, or if it is being solved at another level in the management stack.</dd> - <dt><a href="locking-lockd.html">lockd</a></dt> + <dt><code><a href="locking-lockd.html">lockd</a></code></dt> <dd>This is the current preferred implementation shipped with libvirt. It uses the <code>virtlockd</code> daemon to manage locks using the POSIX fcntl() advisory locking capability. As such it requires a shared filesystem of some kind be accessible to all hosts which share the same image storage.</dd> - <dt><a href="locking-sanlock.html">sanlock</a></dt> + <dt><code><a href="locking-sanlock.html">sanlock</a></code></dt> <dd>This is an alternative implementation preferred by the oVirt project. It uses a disk paxos algorithm for maintaining continuously renewed leases. In the default diff --git a/docs/remote.html.in b/docs/remote.html.in index dc9b354..ace1577 100644 --- a/docs/remote.html.in +++ b/docs/remote.html.in @@ -102,7 +102,7 @@ much slower than, say, direct hypervisor calls. </li> Remote libvirt supports a range of transports: <dl> - <dt> tls </dt> + <dt><code>tls</code></dt> <dd><a href="http://en.wikipedia.org/wiki/Transport_Layer_Security" title="Transport Layer Security">TLS</a> 1.0 (SSL 3.1) authenticated and encrypted TCP/IP socket, usually listening on a public port number. To use this you will need to @@ -110,7 +110,7 @@ Remote libvirt supports a range of transports: server certificates</a>. The standard port is 16514. </dd> - <dt> unix </dt> + <dt><code>unix</code></dt> <dd> Unix domain socket. Since this is only accessible on the local machine, it is not encrypted, and uses Unix permissions or SELinux for authentication. @@ -119,7 +119,7 @@ Remote libvirt supports a range of transports: <code>/var/run/libvirt/libvirt-sock-ro</code> (the latter for read-only connections). </dd> - <dt> ssh </dt> + <dt><code>ssh</code></dt> <dd> Transported over an ordinary <a href="http://www.openssh.com/" title="OpenSSH homepage">ssh (secure shell)</a> connection. @@ -130,15 +130,15 @@ Remote libvirt supports a range of transports: <a href="http://mah.everybody.org/docs/ssh" title="Using ssh-agent with ssh">ssh-agent</a>) otherwise programs which use this transport will stop to ask for a password. </dd> - <dt> ext </dt> + <dt><code>ext</code></dt> <dd> Any external program which can make a connection to the remote machine by means outside the scope of libvirt. </dd> - <dt> tcp </dt> + <dt><code>tcp</code></dt> <dd> Unencrypted TCP/IP socket. Not recommended for production use, this is normally disabled, but an administrator can enable it for testing or use over a trusted network. The standard port is 16509. </dd> - <dt> libssh2 </dt> + <dt><code>libssh2</code></dt> <dd> Transport over the SSH protocol using <a href="http://libssh2.org/" title="libssh2 homepage">libssh2</a> instead of the OpenSSH binary. This transport uses the libvirt authentication callback for -- 2.5.5

2 1

[libvirt] [PATCH] virconf: Handle conf file without ending newline
by Cole Robinson 21 Apr '16

21 Apr '16

$ echo -n 'log_level=1' > ~/.config/libvirt/libvirtd.conf $ libvirtd --timeout=10 2014-10-10 10:30:56.394+0000: 6626: info : libvirt version: 1.1.3.6, package: 1.fc20 (Fedora Project, 2014-09-08-17:50:42, buildvm-05.phx2.fedoraproject.org) 2014-10-10 10:30:56.394+0000: 6626: error : main:1261 : Can't load config file: configuration file syntax error: /home/rjones/.config/libvirt/libvirtd.conf:1: expecting a value: /home/rjones/.config/libvirt/libvirtd.conf Rather than try to fix this in the depths of the parser, just catch the case when a config file doesn't end in a newline, and manually append a newline to the content before parsing https://bugzilla.redhat.com/show_bug.cgi?id=1151409 --- src/util/virconf.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/util/virconf.c b/src/util/virconf.c index 5915bc2..9b19d54 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -765,7 +765,7 @@ virConfReadFile(const char *filename, unsigned int flags) { char *content; int len; - virConfPtr conf; + virConfPtr conf = NULL; VIR_DEBUG("filename=%s", NULLSTR(filename)); @@ -777,8 +777,16 @@ virConfReadFile(const char *filename, unsigned int flags) if ((len = virFileReadAll(filename, MAX_CONFIG_FILE_SIZE, &content)) < 0) return NULL; + if (len && len < MAX_CONFIG_FILE_SIZE && content[len - 1] != '\n') { + VIR_DEBUG("appending newline to busted config file %s", filename); + if (VIR_REALLOC_N(content, len + 1) < 0) + goto cleanup; + content[len++] = '\n'; + } + conf = virConfParse(filename, content, len, flags); + cleanup: VIR_FREE(content); return conf; -- 2.7.3

2 2

[libvirt] [PATCH 00/14] conf: disk: Continue refactoring of virDomainDiskDefParseXML
by Peter Krempa 21 Apr '16

21 Apr '16

This is yet another dump of my quest to despaghettize virDomainDiskDefParseXML. My eyes are starting to bleed a bit less, but there's still a lot of patches to come. Peter Krempa (14): conf: disk: Extract verification of disk config conf: disk: Split out parsing of disk <driver> element conf: disk: Avoid temporary variable when parsing driver name conf: disk: Sanitize parsing of disk format conf: disk: Mark VIR_DOMAIN_DISK_IO_DEFAULT as 0 and simplify parsing conf: disk: Remove custom single-use temporary variables conf: disk: Extract disk type and device right away conf: disk: Initialize closed device tray state to 0 conf: disk: Don't bother setting removable state to 0 by default conf: disk: extract sgio/rawio validation conf: disk: Extract verification of disk tray conf: disk: Move validation of disk bus vs disk type conf: disk: Extract checking of removable status conf: disk: extract validation of startup policy src/conf/domain_conf.c | 452 ++++++++++++++++++++++++------------------------- src/conf/domain_conf.h | 4 +- 2 files changed, 221 insertions(+), 235 deletions(-) -- 2.8.1

2 28

[libvirt] [PATCH 0/4] Introduce big test mock
by Michal Privoznik 21 Apr '16

21 Apr '16

What? Big test mock that checks all our file accesses whether we are touching anything outside $srcdir or $builddir. Why? Because it has happened in the past (and is happening even now as you'll see later) that our test suite produces nondeterministic results because of a file in live system being accessible or having some specific value. How? Well, this is merely introducing a mock library that every C program on Linux will use. I'm not aware of any approach for our shell tests. The mock library then collects all the paths outside $srcdir or $builddir and prints them into a file. The file is then checked against a white list, because some accesses might be desirable. Unfortunately, as you'll learn in the 4/4 commit message, I was unable to wire this up to 'make check' so this is accessible under 'make check-access' target. If there's some access outside aforementioned directories, the path will be printed out. So far there is plenty of them. For instance, in qemuxml2argvtest we are checking /proc/sys/crypto/fips_enabled for each test. Ouch. What's left to do? a) Enhance white list b) Wire this up to 'check' c) Test d) Review Michal Privoznik (4): seclabeltest: Update to use VIRT_TEST_MAIN tests: Introduce global mock library virtestmock: Print invalid file accesses into a file tests: Introduce check-file-access.pl .gitignore | 1 + HACKING | 11 ++ Makefile.am | 3 + cfg.mk | 8 +- docs/hacking.html.in | 15 +++ tests/Makefile.am | 28 +++- tests/check-file-access.pl | 106 +++++++++++++++ tests/file_access_whitelist.txt | 19 +++ tests/seclabeltest.c | 7 +- tests/testutils.c | 58 ++++++++- tests/testutils.h | 29 +---- tests/vircgroupmock.c | 6 +- tests/virpcimock.c | 6 +- tests/virtestmock.c | 279 ++++++++++++++++++++++++++++++++++++++++ 14 files changed, 535 insertions(+), 41 deletions(-) create mode 100755 tests/check-file-access.pl create mode 100644 tests/file_access_whitelist.txt create mode 100644 tests/virtestmock.c -- 2.7.3

2 6

[libvirt] [PATCH] build: Fix default network generation on FreeBSD
by Andrea Bolognani 21 Apr '16

21 Apr '16

FreeBSD's sed(1) doesn't support using "\n" to insert a newline, so the installed default.xml file ends up containing a literal "n" between tags; to work around this problem, add a tr(1) invocation as suggested by the sed FAQ[1]. [1] http://sed.sourceforge.net/sedfaq4.html (4.1 c) --- src/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c639e37..f020545 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3072,8 +3072,9 @@ if WITH_NETWORK $(INSTALL_DATA) $(srcdir)/network/default.xml \ $(DESTDIR)$(confdir)/qemu/networks/default.xml test -z "$(UUID)" || \ - { sed -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \ - $(DESTDIR)$(confdir)/qemu/networks/default.xml > \ + { sed -e "s,</name>,</name>; <uuid>$(UUID)</uuid>," \ + $(DESTDIR)$(confdir)/qemu/networks/default.xml | \ + tr ";" "\n" > \ $(DESTDIR)$(confdir)/qemu/networks/default.xml.t && \ cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \ $(DESTDIR)$(confdir)/qemu/networks/default.xml && \ -- 2.5.5

2 2

[libvirt] [PATCH] docs: Update style for <dt> elements
by John Ferlan 21 Apr '16

21 Apr '16

Add bolding for <dt> elements to make them "stick out" on the page rather that just a stream of text where the <dt> elements only differ by slightly different font style since most uses encase the text within using <code> Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- I had suggested this during a review of Andrea's changes late last month: http://www.redhat.com/archives/libvir-list/2016-March/msg01501.html but figure I'll make the more 'formal' patch request... docs/generic.css | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/generic.css b/docs/generic.css index 208e31e..b86bb88 100644 --- a/docs/generic.css +++ b/docs/generic.css @@ -25,6 +25,7 @@ ul, ol { dt { margin-left: 1em; margin-right: 2em; + font-weight: bold; } dl dd { -- 2.5.5

2 3

[libvirt] [PATCH] tools: Fix connect command
by Martin Kletzander 21 Apr '16

21 Apr '16

The man page says: "(Re)-Connect to the hypervisor. When the shell is first started, this is automatically run with the URI parameter requested by the "-c" option on the command line." However, if you run: virsh -c 'test://default' 'connect; uri' the output will not be 'test://default'. That's because the 'connect' command does not care about any virsh-only related settings and if it is run without parameters, it connects with @uri == NULL. Not only that doesn't comply to what the man page describes, but it also doesn't make sense. It also means you aren't able to reconnect to whatever you are connected currently. So let's fix that in both virsh and virt-admin add a test case for it. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/test-lib.sh | 6 ++++++ tests/virsh-uriprecedence | 54 +++++++++++++++++++++++++++++++++++------------ tools/virsh.c | 6 ++++-- tools/virt-admin.c | 6 ++++-- 4 files changed, 55 insertions(+), 17 deletions(-) diff --git a/tests/test-lib.sh b/tests/test-lib.sh index 8e0ce83e118c..49e8d2209572 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -232,6 +232,12 @@ if test -n "$VIR_TEST_DEBUG" || test -n "$VIR_TEST_VERBOSE" ; then verbose=1 fi +debug() { :; } + +if test "$VIR_TEST_DEBUG" = "2"; then + debug() { echo "$@"; } +fi + # This is a stub function that is run upon trap (upon regular exit and # interrupt). Override it with a per-test function, e.g., to unmount # a partition, or to undo any other global state changes. diff --git a/tests/virsh-uriprecedence b/tests/virsh-uriprecedence index f9e325658900..4bcce3aeb08f 100755 --- a/tests/virsh-uriprecedence +++ b/tests/virsh-uriprecedence @@ -8,7 +8,8 @@ test_intro "virsh-uriprecedence" virsh_bin="$abs_top_builddir/tools/virsh" -counter=1 +virsh_cmd="$virsh_bin" +counter=0 ret=0 cleanup_() { rm -rf "$tmphome"; } @@ -23,16 +24,44 @@ mkdir -p "$XDG_CONFIG_HOME/libvirt" "$XDG_CONFIG_HOME/virsh" mkdir -p "$XDG_CACHE_HOME/libvirt" "$XDG_CACHE_HOME/virsh" mkdir -p "$XDG_RUNTIME_HOME/libvirt" "$XDG_RUNTIME_HOME/virsh" -# Main function checking for the proper uri being returned +is_uri_good() +{ + echo "$1" | grep -q -F "$good_uri" +} + +test_uri_internal() +{ + test_name=$1 + test_cmd="$virsh_cmd \"$2\"" + result=0 + + debug "Running '$test_cmd'" + out="$($virsh_cmd "$2")" + + if ! is_uri_good "$out"; then + debug "Invalid output: '$out'" + result=1 + ret=1 + fi + + counter="$((counter+1))" + test_result "$counter" "$1" "$result" +} + +test_uri_connect() +{ + test_uri_internal "$1" "connect; uri" +} + +test_uri_noconnect() +{ + test_uri_internal "$1" "uri" +} + test_uri() { - result=0 - if [ "$($virsh_bin uri)" != "$good_uri" ]; then - result=1 - ret=1 - fi - test_result "$counter" "$1" "$result" - counter="$((counter+1))" + test_uri_connect "$1" + test_uri_noconnect "$1" } # Precedence is the following (lowest priority first): @@ -57,6 +86,7 @@ good_uri="test:///default?good_uri" printf "uri_default=\"%s\"\n" "$good_uri" >"$XDG_CONFIG_HOME/libvirt/libvirt.conf" if uid_is_privileged_; then + counter="$((counter+1))" test_skip_case "$counter" "User config file" "must not be run as root" else test_uri "User config file" @@ -71,10 +101,8 @@ export VIRSH_DEFAULT_CONNECT_URI="$good_uri" test_uri "VIRSH_DEFAULT_CONNECT_URI" export VIRSH_DEFAULT_CONNECT_URI="$bad_uri" -virsh_bin="$virsh_bin --connect $good_uri" +virsh_cmd="$virsh_bin --connect $good_uri" test_uri "Parameter" -# test_uri() increases $counter even for the last test, so we must -# decrement it -test_final "$((counter-1))" "$ret" +test_final "$counter" "$ret" (exit "$ret"); exit "$ret" diff --git a/tools/virsh.c b/tools/virsh.c index 366956cd5c75..d17aaf0be8ea 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -306,11 +306,13 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) priv->conn = NULL; } - VIR_FREE(ctl->connname); if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) return false; - ctl->connname = vshStrdup(ctl, name); + if (name) { + VIR_FREE(ctl->connname); + ctl->connname = vshStrdup(ctl, name); + } priv->useGetInfo = false; priv->useSnapshotOld = false; diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 22160ad929d0..4275aa37a1bf 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -291,8 +291,10 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) return false; - VIR_FREE(ctl->connname); - ctl->connname = vshStrdup(ctl, name); + if (name) { + VIR_FREE(ctl->connname); + ctl->connname = vshStrdup(ctl, name); + } vshAdmReconnect(ctl); if (!connected) -- 2.8.1

2 1

[libvirt] [PATCH] tests: Use system() for test-wrap-argv.pl
by Cole Robinson 21 Apr '16

21 Apr '16

virCommand doesn't buy us anything here, and this simplifies the code. There's another usage of system() in testutils.c already FWIW, though it predates virCommand --- Had this sitting in a branch from an earlier discussion... I figure system() is safe in the test suite but I'm not going to argue if someone feels strongly the other way tests/testutils.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 79d0763..7664b06 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -432,28 +432,14 @@ virtTestCaptureProgramOutput(const char *const argv[] ATTRIBUTE_UNUSED, static int virTestRewrapFile(const char *filename) { - int ret = -1; - char *outbuf = NULL; - char *script = NULL; - virCommandPtr cmd = NULL; - - if (virAsprintf(&script, "%s/test-wrap-argv.pl", abs_srcdir) < 0) - goto cleanup; - - cmd = virCommandNewArgList(script, filename, NULL); - virCommandSetOutputBuffer(cmd, &outbuf); - if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + char *cmd; - if (virFileWriteStr(filename, outbuf, 0666) < 0) - goto cleanup; + /* The 'echo' syntax lets us read and write the file in one shot */ + if (virAsprintf(&cmd, "echo \"$(%s/test-wrap-argv.pl %s)\" > %s", + abs_srcdir, filename, filename) < 0) + return -1; - ret = 0; - cleanup: - VIR_FREE(script); - virCommandFree(cmd); - VIR_FREE(outbuf); - return ret; + return system(cmd); } /** -- 2.7.3

5 5

[libvirt] [PATCH] lxc: explicitly error on interface type=ethernet
by Cole Robinson 21 Apr '16

21 Apr '16

It isn't implemented and does not work: error: internal error: guest failed to start: /usr/lib/libvirt/libvirt_lxc: option '--veth' requires an argument syntax: /usr/lib/libvirt/libvirt_lxc [OPTIONS] ... We previously threw an explicit error, but this changed in 22cff52a2b8e06c913b1f97767e5d390fb17fc3b , which I suspect was untested for LXC --- src/lxc/lxc_process.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 5e0bbe2..0044ee5 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -559,8 +559,6 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, break; case VIR_DOMAIN_NET_TYPE_ETHERNET: - break; - case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: -- 2.7.3

3 4

[libvirt] [libvirt-glib] events: Mark 'eventlock' as static
by Christophe Fergeau 21 Apr '16

21 Apr '16

It's not used outside of the libvirt-glib-event.c file, so there is no good reason for not having it static. As it was not listed in libvirt-glib.sym, this will make no change to the publicly exported symbols (ie this is not an ABI change). --- libvirt-glib/libvirt-glib-event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index f8227d6..4548aa6 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -110,7 +110,7 @@ struct gvir_event_timeout virFreeCallback ff; }; -GMutex *eventlock = NULL; +static GMutex *eventlock = NULL; static int nextwatch = 1; static GPtrArray *handles; -- 2.5.0

1 1

[libvirt] [PATCH 0/4] Fix python sanity check after moving typedParam stuff to libvirt-common.h
by Peter Krempa 21 Apr '16

21 Apr '16

Fixes the following breakage: Cannot get a value of enum VIR_TYPED_PARAM_BOOLEAN (originally VIR_DOMAIN_BLKIO_PARAM_BOOLEAN) Cannot get a value of enum VIR_TYPED_PARAM_DOUBLE (originally VIR_DOMAIN_BLKIO_PARAM_DOUBLE) Cannot get a value of enum VIR_TYPED_PARAM_INT (originally VIR_DOMAIN_BLKIO_PARAM_INT) ... Peter Krempa (4): include: common: Fix file header for apibuild.py apibuild: Allow completely skipping certain macros api: Generate docs for libvirt-common.h include: common: Fix function formatting docs/Makefile.am | 1 + docs/apibuild.py | 12 +++ docs/sitemap.html.in | 4 + include/libvirt/libvirt-common.h.in | 173 ++++++++++++++++-------------------- 4 files changed, 95 insertions(+), 95 deletions(-) -- 2.8.1

2 7