[libvirt] [PATCH v3] driver: Include source as a flag to virDomainGetHostname
by Julio Faracco
There is a lots of possibilities to retrieve hostname information from
domain. Libvirt could use lease information from dnsmasq to get current
hostname too. QEMU supports QEMU-agent but it can use lease source. See
'domifaddr' as an example.
This commit still adds lease options for QEMU. It will get the first
hostname available from domain networks.
This case, QEMU driver has a default section inside switch to keep
compatibility. So, if someone call 'domhostname' without specifying
source, it will get the default option. Some other drivers like LXC and
OpenVZ supports only one type, virCheckFlags will handle this case.
Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com>
---
v1-v2: Moving sources into flags.
v2-v3: Applying Michal's suggestions.
---
docs/manpages/virsh.rst | 7 ++-
include/libvirt/libvirt-domain.h | 5 ++
src/lxc/lxc_driver.c | 78 ++++++++++++++++++++++++++++++++
src/qemu/qemu_driver.c | 76 +++++++++++++++++++++++++++----
tools/virsh-completer-domain.c | 17 +++++++
tools/virsh-completer-domain.h | 4 ++
tools/virsh-domain.c | 26 ++++++++++-
7 files changed, 201 insertions(+), 12 deletions(-)
diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
index fea0527caf..ba483d4d00 100644
--- a/docs/manpages/virsh.rst
+++ b/docs/manpages/virsh.rst
@@ -1797,10 +1797,15 @@ domhostname
.. code-block::
- domhostname domain
+ domhostname domain [--source lease|agent]
Returns the hostname of a domain, if the hypervisor makes it available.
+The *--source* argument specifies what data source to use for the
+hostnames, currently 'lease' to read DHCP leases or 'agent' to query
+the guest OS via an agent. If unspecified, driver returns the default
+method available (some drivers support only one type of source).
+
domid
-----
diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index e60003978a..666c1875cc 100644
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -4833,6 +4833,11 @@ typedef struct _virTypedParameter virMemoryParameter;
*/
typedef virMemoryParameter *virMemoryParameterPtr;
+typedef enum {
+ VIR_DOMAIN_GET_HOSTNAME_LEASE = (1 << 0), /* Parse DHCP lease file */
+ VIR_DOMAIN_GET_HOSTNAME_AGENT = (1 << 1), /* Query qemu guest agent */
+} virDomainGetHostnameFlags;
+
typedef enum {
VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE = 0, /* Parse DHCP lease file */
VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT = 1, /* Query qemu guest agent */
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 780c6ed4a2..2dac730e70 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -5291,6 +5291,83 @@ lxcDomainGetCPUStats(virDomainPtr dom,
}
+static char *
+lxcDomainGetHostname(virDomainPtr dom,
+ unsigned int flags)
+{
+ virLXCDriverPtr driver = dom->conn->privateData;
+ virDomainObjPtr vm = NULL;
+ char macaddr[VIR_MAC_STRING_BUFLEN];
+ g_autoptr(virConnect) conn = NULL;
+ virNetworkDHCPLeasePtr *leases = NULL;
+ int n_leases;
+ size_t i, j;
+ char *hostname = NULL;
+
+ virCheckFlags(VIR_DOMAIN_GET_HOSTNAME_LEASE, NULL);
+
+ if (!(vm = lxcDomObjFromDomain(dom)))
+ return NULL;
+
+ if (virDomainGetHostnameEnsureACL(dom->conn, vm->def) < 0)
+ goto cleanup;
+
+ if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_QUERY) < 0)
+ goto cleanup;
+
+ if (virDomainObjCheckActive(vm) < 0)
+ goto endjob;
+
+ if (!(conn = virGetConnectNetwork()))
+ goto endjob;
+
+ for (i = 0; i < vm->def->nnets; i++) {
+ g_autoptr(virNetwork) network = NULL;
+
+ if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK)
+ continue;
+
+ virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr);
+ network = virNetworkLookupByName(conn,
+ vm->def->nets[i]->data.network.name);
+
+ if (!network)
+ goto endjob;
+
+ if ((n_leases = virNetworkGetDHCPLeases(network, macaddr,
+ &leases, 0)) < 0)
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("There is no available hostname %d"),
+ flags);
+
+ for (j = 0; j < n_leases; j++) {
+ virNetworkDHCPLeasePtr lease = leases[j];
+ if (lease->hostname) {
+ hostname = g_strdup(lease->hostname);
+
+ for (j = 0; j < n_leases; j++)
+ virNetworkDHCPLeaseFree(leases[j]);
+
+ VIR_FREE(leases);
+
+ goto endjob;
+ }
+
+ virNetworkDHCPLeaseFree(lease);
+ }
+
+ VIR_FREE(leases);
+ }
+
+ endjob:
+ virLXCDomainObjEndJob(driver, vm);
+
+ cleanup:
+ virDomainObjEndAPI(&vm);
+ return hostname;
+}
+
+
static int
lxcNodeGetFreePages(virConnectPtr conn,
unsigned int npages,
@@ -5436,6 +5513,7 @@ static virHypervisorDriver lxcHypervisorDriver = {
.domainSetMetadata = lxcDomainSetMetadata, /* 1.1.3 */
.domainGetMetadata = lxcDomainGetMetadata, /* 1.1.3 */
.domainGetCPUStats = lxcDomainGetCPUStats, /* 1.2.2 */
+ .domainGetHostname = lxcDomainGetHostname, /* 6.0.0 */
.nodeGetMemoryParameters = lxcNodeGetMemoryParameters, /* 0.10.2 */
.nodeSetMemoryParameters = lxcNodeSetMemoryParameters, /* 0.10.2 */
.domainSendProcessSignal = lxcDomainSendProcessSignal, /* 1.0.1 */
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ec8faf384c..d8ed859f70 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -20280,9 +20280,19 @@ qemuDomainGetHostname(virDomainPtr dom,
virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm = NULL;
qemuAgentPtr agent;
+ char macaddr[VIR_MAC_STRING_BUFLEN];
+ g_autoptr(virConnect) conn = NULL;
+ virNetworkDHCPLeasePtr *leases = NULL;
+ int n_leases;
+ size_t i, j;
char *hostname = NULL;
- virCheckFlags(0, NULL);
+ virCheckFlags(VIR_DOMAIN_GET_HOSTNAME_LEASE |
+ VIR_DOMAIN_GET_HOSTNAME_AGENT, NULL);
+
+ VIR_EXCLUSIVE_FLAGS_RET(VIR_DOMAIN_GET_HOSTNAME_LEASE,
+ VIR_DOMAIN_GET_HOSTNAME_AGENT,
+ NULL);
if (!(vm = qemuDomainObjFromDomain(dom)))
return NULL;
@@ -20290,18 +20300,66 @@ qemuDomainGetHostname(virDomainPtr dom,
if (virDomainGetHostnameEnsureACL(dom->conn, vm->def) < 0)
goto cleanup;
- if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0)
- goto cleanup;
-
if (virDomainObjCheckActive(vm) < 0)
goto endjob;
- if (!qemuDomainAgentAvailable(vm, true))
- goto endjob;
+ switch (flags) {
+ default:
+ case VIR_DOMAIN_GET_HOSTNAME_AGENT:
+ if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0)
+ goto cleanup;
- agent = qemuDomainObjEnterAgent(vm);
- ignore_value(qemuAgentGetHostname(agent, &hostname));
- qemuDomainObjExitAgent(vm, agent);
+ if (!qemuDomainAgentAvailable(vm, true))
+ goto endjob;
+
+ agent = qemuDomainObjEnterAgent(vm);
+ ignore_value(qemuAgentGetHostname(agent, &hostname));
+ qemuDomainObjExitAgent(vm, agent);
+
+ break;
+ case VIR_DOMAIN_GET_HOSTNAME_LEASE:
+ if (!(conn = virGetConnectNetwork()))
+ goto endjob;
+
+ for (i = 0; i < vm->def->nnets; i++) {
+ g_autoptr(virNetwork) network = NULL;
+
+ if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK)
+ continue;
+
+ virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr);
+ network = virNetworkLookupByName(conn,
+ vm->def->nets[i]->data.network.name);
+
+ if (!network)
+ goto endjob;
+
+ if ((n_leases = virNetworkGetDHCPLeases(network, macaddr,
+ &leases, 0)) < 0)
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("There is no available hostname %d"),
+ flags);
+
+ for (j = 0; j < n_leases; j++) {
+ virNetworkDHCPLeasePtr lease = leases[j];
+ if (lease->hostname) {
+ hostname = g_strdup(lease->hostname);
+
+ for (j = 0; j < n_leases; j++)
+ virNetworkDHCPLeaseFree(leases[j]);
+
+ VIR_FREE(leases);
+
+ goto endjob;
+ }
+
+ virNetworkDHCPLeaseFree(lease);
+ }
+
+ VIR_FREE(leases);
+ }
+ break;
+ }
endjob:
qemuDomainObjEndAgentJob(vm);
diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c
index 0311ee50d0..67e67d485a 100644
--- a/tools/virsh-completer-domain.c
+++ b/tools/virsh-completer-domain.c
@@ -296,3 +296,20 @@ virshDomainShutdownModeCompleter(vshControl *ctl,
return virshCommaStringListComplete(mode, modes);
}
+
+
+char **
+virshDomainGetHosnameSourcesCompleter(vshControl *ctl,
+ const vshCmd *cmd,
+ unsigned int flags)
+{
+ const char *sources[] = {"lease", "agent", NULL};
+ const char *source = NULL;
+
+ virCheckFlags(0, NULL);
+
+ if (vshCommandOptStringQuiet(ctl, cmd, "source", &source) < 0)
+ return NULL;
+
+ return virshCommaStringListComplete(source, sources);
+}
diff --git a/tools/virsh-completer-domain.h b/tools/virsh-completer-domain.h
index 083ab327cc..ad1b37a255 100644
--- a/tools/virsh-completer-domain.h
+++ b/tools/virsh-completer-domain.h
@@ -53,3 +53,7 @@ char ** virshDomainDeviceAliasCompleter(vshControl *ctl,
char ** virshDomainShutdownModeCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags);
+
+char ** virshDomainGetHosnameSourcesCompleter(vshControl *ctl,
+ const vshCmd *cmd,
+ unsigned int flags);
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 9d4cdd26dd..73e6780116 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -11743,6 +11743,11 @@ static const vshCmdInfo info_domhostname[] = {
static const vshCmdOptDef opts_domhostname[] = {
VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE),
+ {.name = "source",
+ .type = VSH_OT_STRING,
+ .flags = VSH_OFLAG_NONE,
+ .completer = virshDomainGetHosnameSourcesCompleter,
+ .help = N_("address source: 'lease' or 'agent'")},
{.name = NULL}
};
@@ -11752,21 +11757,38 @@ cmdDomHostname(vshControl *ctl, const vshCmd *cmd)
char *hostname;
virDomainPtr dom;
bool ret = false;
+ const char *sourcestr = NULL;
+ int flags = 0; /* Use default value. Drivers can have its own default. */
if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
return false;
- hostname = virDomainGetHostname(dom, 0);
+ if (vshCommandOptStringReq(ctl, cmd, "source", &sourcestr) < 0)
+ goto error;
+
+ if (sourcestr) {
+ if (STREQ(sourcestr, "lease")) {
+ flags |= VIR_DOMAIN_GET_HOSTNAME_LEASE;
+ } else if (STREQ(sourcestr, "agent")) {
+ flags |= VIR_DOMAIN_GET_HOSTNAME_AGENT;
+ } else {
+ vshError(ctl, _("Unknown data source '%s'"), sourcestr);
+ goto error;
+ }
+ }
+
+ hostname = virDomainGetHostname(dom, flags);
if (hostname == NULL) {
vshError(ctl, "%s", _("failed to get hostname"));
goto error;
}
vshPrint(ctl, "%s\n", hostname);
+
+ VIR_FREE(hostname);
ret = true;
error:
- VIR_FREE(hostname);
virshDomainFree(dom);
return ret;
}
--
2.20.1
4 years, 10 months
[libvirt] [jenkins-ci PATCH v3 0/3] Add all possible projects to openSUSE 15.1
by Fabiano Fidêncio
Now that openSUSE 15.1 is a thing on libvirt-jenkins-ci, let's add all
possible projects to the OS, doing the needed mappings adjustments
whenever needed.
Changes since v2:
https://www.redhat.com/archives/libvir-list/2020-January/msg00333.html
- Split meson change into its specific patch;
- Re-ordered the commits based on Andrea's request;
- (Possibly) Fixed all the issues pointed by Andrea;
Changes since v1:
https://www.redhat.com/archives/libvir-list/2020-January/msg00321.html
- Added libvirt-perl and updated the mappings accordingly.
Fabiano Fidêncio (3):
mappings: Use meson from pip on openSUSE 15.1
mappings: Adjust mappings for openSUSE 15.1
guests: Add projects to openSUSE 15.1
guests/host_vars/libvirt-opensuse-151/main.yml | 14 ++++++++++++++
guests/playbooks/build/projects/libvirt-dbus.yml | 1 +
.../playbooks/build/projects/libvirt-sandbox.yml | 1 +
guests/playbooks/build/projects/virt-manager.yml | 2 ++
guests/vars/mappings.yml | 16 ++++++++++++++++
5 files changed, 34 insertions(+)
--
2.24.1
4 years, 10 months
[libvirt] [PATCH 00/16] include result of bootstrap in git
by Pavel Hrdina
This patch series is motivated by the effort to adopt Meson as our
build system but all of it improves the current build system on its own.
It moves the burden to run bootstrap/autoreconf to developers which
means it will save some time for others when there is any change to
the build system.
Since one of the patches is slightly bigger here is link to git:
<https://gitlab.com/phrdina/libvirt/commits/configure>
Pavel Hrdina (16):
secret: move virSecretGetSecretString into virsecret
configure.ac: add check for getegid function
bootstrap.conf: drop gnulib tests from libvirt
bootstrap.conf: add pthread-h module
bootstrap.conf: always copy files
bootstrap.conf: declare bootstrap sync in configuration file
bootstrap.conf: disable VC ignore files
bootstrap.conf: stop creating AUTHORS file
syntax-check: remove deleted daemon directory from space_indent_check
autogen.sh: fix autoreconf step
autogen.sh: move --system option to configure as --with-system
gnulib: store result of bootstrap in git
replace any autogen.sh reference with configure
autogen.sh: remove configure related code
autogen.sh: remove --dry-run option
autogen.sh: remove --no-git and --gnulib-srcdir options
.git-module-status | 2 +
.gitignore | 18 -
.gitlab-ci.yml | 2 +-
.travis.yml | 4 +-
INSTALL | 368 +
Makefile.am | 2 +-
Makefile.in | 2323 +
README-hacking | 5 +-
aclocal.m4 | 1719 +
autogen.sh | 150 +-
bootstrap.conf | 29 +-
build-aux/compile | 348 +
build-aux/config.guess | 1667 +
build-aux/config.sub | 1793 +
build-aux/depcomp | 791 +
build-aux/install-sh | 529 +
build-aux/ltmain.sh | 11149 ++++
build-aux/missing | 215 +
build-aux/syntax-check.mk | 23 +-
build-aux/test-driver | 148 +
ci/build.sh | 1 -
config.h.in | 2303 +
configure | 56615 +++++++++++++++++++
configure.ac | 16 +-
docs/Makefile.in | 2614 +
docs/compiling.html.in | 21 +-
examples/Makefile.in | 2494 +
gnulib/lib/Makefile.in | 3997 ++
gnulib/lib/_Noreturn.h | 40 +
gnulib/lib/accept.c | 52 +
gnulib/lib/alloca.c | 478 +
gnulib/lib/alloca.in.h | 71 +
gnulib/lib/arg-nonnull.h | 26 +
gnulib/lib/arpa_inet.in.h | 150 +
gnulib/lib/asnprintf.c | 34 +
gnulib/lib/assure.h | 37 +
gnulib/lib/binary-io.c | 39 +
gnulib/lib/binary-io.h | 77 +
gnulib/lib/bind.c | 49 +
gnulib/lib/c++defs.h | 316 +
gnulib/lib/chown.c | 151 +
gnulib/lib/cloexec.c | 83 +
gnulib/lib/cloexec.h | 38 +
gnulib/lib/close.c | 71 +
gnulib/lib/connect.c | 56 +
gnulib/lib/dup2.c | 235 +
gnulib/lib/errno.in.h | 279 +
gnulib/lib/fchown-stub.c | 16 +
gnulib/lib/fcntl.c | 627 +
gnulib/lib/fcntl.in.h | 392 +
gnulib/lib/fd-hook.c | 116 +
gnulib/lib/fd-hook.h | 119 +
gnulib/lib/filename.h | 54 +
gnulib/lib/float+.h | 147 +
gnulib/lib/float.c | 33 +
gnulib/lib/float.in.h | 188 +
gnulib/lib/fseek.c | 30 +
gnulib/lib/fseeko.c | 164 +
gnulib/lib/fstat.c | 94 +
gnulib/lib/gai_strerror.c | 92 +
gnulib/lib/getaddrinfo.c | 473 +
gnulib/lib/getdelim.c | 147 +
gnulib/lib/getdtablesize.c | 124 +
gnulib/lib/getgroups.c | 131 +
gnulib/lib/gethostname.c | 104 +
gnulib/lib/getline.c | 27 +
gnulib/lib/getpass.c | 231 +
gnulib/lib/getpass.h | 4 +
gnulib/lib/getpeername.c | 49 +
gnulib/lib/getsockname.c | 49 +
gnulib/lib/gettext.h | 301 +
gnulib/lib/getugroups.c | 128 +
gnulib/lib/getugroups.h | 19 +
gnulib/lib/glthread/threadlib.c | 73 +
gnulib/lib/gnulib.mk | 2806 +
gnulib/lib/inet_ntop.c | 260 +
gnulib/lib/intprops.h | 584 +
gnulib/lib/ioctl.c | 92 +
gnulib/lib/itold.c | 28 +
gnulib/lib/limits.in.h | 104 +
gnulib/lib/listen.c | 49 +
gnulib/lib/localcharset.c | 1159 +
gnulib/lib/localcharset.h | 137 +
gnulib/lib/locale.in.h | 305 +
gnulib/lib/localeconv.c | 103 +
gnulib/lib/lseek.c | 71 +
gnulib/lib/malloc.c | 56 +
gnulib/lib/malloca.c | 105 +
gnulib/lib/malloca.h | 123 +
gnulib/lib/memchr.c | 172 +
gnulib/lib/memchr.valgrind | 30 +
gnulib/lib/mgetgroups.c | 201 +
gnulib/lib/mgetgroups.h | 22 +
gnulib/lib/msvc-inval.c | 129 +
gnulib/lib/msvc-inval.h | 222 +
gnulib/lib/msvc-nothrow.c | 51 +
gnulib/lib/msvc-nothrow.h | 43 +
gnulib/lib/net_if.in.h | 53 +
gnulib/lib/netdb.in.h | 293 +
gnulib/lib/netinet_in.in.h | 47 +
gnulib/lib/nonblocking.c | 159 +
gnulib/lib/nonblocking.h | 62 +
gnulib/lib/open.c | 203 +
gnulib/lib/openpty.c | 136 +
gnulib/lib/passfd.c | 205 +
gnulib/lib/passfd.h | 32 +
gnulib/lib/pathmax.h | 83 +
gnulib/lib/physmem.c | 330 +
gnulib/lib/physmem.h | 26 +
gnulib/lib/pipe.c | 50 +
gnulib/lib/pipe2.c | 167 +
gnulib/lib/poll.c | 621 +
gnulib/lib/poll.in.h | 125 +
gnulib/lib/posix_openpt.c | 108 +
gnulib/lib/printf-args.c | 183 +
gnulib/lib/printf-args.h | 150 +
gnulib/lib/printf-parse.c | 632 +
gnulib/lib/printf-parse.h | 193 +
gnulib/lib/pthread.in.h | 1831 +
gnulib/lib/pthread_sigmask.c | 92 +
gnulib/lib/pty.in.h | 131 +
gnulib/lib/raise.c | 83 +
gnulib/lib/rawmemchr.c | 136 +
gnulib/lib/rawmemchr.valgrind | 28 +
gnulib/lib/realloc.c | 79 +
gnulib/lib/recv.c | 49 +
gnulib/lib/sched.in.h | 97 +
gnulib/lib/select.c | 583 +
gnulib/lib/send.c | 49 +
gnulib/lib/setsockopt.c | 65 +
gnulib/lib/sig-handler.c | 3 +
gnulib/lib/sig-handler.h | 51 +
gnulib/lib/sigaction.c | 204 +
gnulib/lib/signal.in.h | 475 +
gnulib/lib/sigprocmask.c | 349 +
gnulib/lib/size_max.h | 30 +
gnulib/lib/snprintf.c | 71 +
gnulib/lib/socket.c | 49 +
gnulib/lib/sockets.c | 161 +
gnulib/lib/sockets.h | 66 +
gnulib/lib/stat-time.c | 3 +
gnulib/lib/stat-time.h | 252 +
gnulib/lib/stat-w32.c | 425 +
gnulib/lib/stat-w32.h | 37 +
gnulib/lib/stat.c | 433 +
gnulib/lib/stdalign.in.h | 121 +
gnulib/lib/stdbool.in.h | 132 +
gnulib/lib/stddef.in.h | 121 +
gnulib/lib/stdint.in.h | 746 +
gnulib/lib/stdio-impl.h | 212 +
gnulib/lib/stdio-read.c | 164 +
gnulib/lib/stdio-write.c | 202 +
gnulib/lib/stdio.in.h | 1444 +
gnulib/lib/stdlib.in.h | 1112 +
gnulib/lib/strchrnul.c | 142 +
gnulib/lib/strchrnul.valgrind | 28 +
gnulib/lib/strdup.c | 54 +
gnulib/lib/streq.h | 176 +
gnulib/lib/string.in.h | 1067 +
gnulib/lib/strtok_r.c | 76 +
gnulib/lib/sys_ioctl.in.h | 79 +
gnulib/lib/sys_select.in.h | 319 +
gnulib/lib/sys_socket.c | 4 +
gnulib/lib/sys_socket.in.h | 721 +
gnulib/lib/sys_stat.in.h | 823 +
gnulib/lib/sys_time.in.h | 224 +
gnulib/lib/sys_types.in.h | 106 +
gnulib/lib/sys_uio.in.h | 63 +
gnulib/lib/sys_utsname.in.h | 108 +
gnulib/lib/sys_wait.in.h | 131 +
gnulib/lib/termios.in.h | 73 +
gnulib/lib/time.in.h | 364 +
gnulib/lib/time_r.c | 44 +
gnulib/lib/ttyname_r.c | 114 +
gnulib/lib/uname.c | 268 +
gnulib/lib/unistd.c | 4 +
gnulib/lib/unistd.in.h | 1719 +
gnulib/lib/unitypes.in.h | 46 +
gnulib/lib/uniwidth.in.h | 72 +
gnulib/lib/uniwidth/cjk.h | 37 +
gnulib/lib/uniwidth/width.c | 468 +
gnulib/lib/vasnprintf.c | 5615 ++
gnulib/lib/vasnprintf.h | 79 +
gnulib/lib/verify.h | 301 +
gnulib/lib/w32sock.h | 140 +
gnulib/lib/waitpid.c | 30 +
gnulib/lib/warn-on-use.h | 131 +
gnulib/lib/wchar.in.h | 1144 +
gnulib/lib/wctype-h.c | 4 +
gnulib/lib/wctype.in.h | 679 +
gnulib/lib/wcwidth.c | 73 +
gnulib/lib/xalloc-oversized.h | 60 +
gnulib/lib/xsize.c | 3 +
gnulib/lib/xsize.h | 117 +
gnulib/tests/Makefile.am | 32 -
include/libvirt/Makefile.in | 1908 +
m4/00gnulib.m4 | 46 +
m4/absolute-header.m4 | 102 +
m4/alloca.m4 | 128 +
m4/arpa_inet_h.m4 | 59 +
m4/asm-underscore.m4 | 72 +
m4/chown.m4 | 216 +
m4/close.m4 | 35 +
m4/codeset.m4 | 24 +
m4/configmake.m4 | 27 +
m4/dup2.m4 | 117 +
m4/eealloc.m4 | 31 +
m4/environ.m4 | 45 +
m4/errno_h.m4 | 133 +
m4/exponentd.m4 | 116 +
m4/extensions.m4 | 189 +
m4/extern-inline.m4 | 114 +
m4/fcntl-o.m4 | 139 +
m4/fcntl.m4 | 126 +
m4/fcntl_h.m4 | 52 +
m4/float_h.m4 | 108 +
m4/fseek.m4 | 15 +
m4/fseeko.m4 | 77 +
m4/fstat.m4 | 39 +
m4/getaddrinfo.m4 | 239 +
m4/getdelim.m4 | 98 +
m4/getdtablesize.m4 | 60 +
m4/getgroups.m4 | 109 +
m4/gethostname.m4 | 107 +
m4/getline.m4 | 109 +
m4/getpass.m4 | 106 +
m4/getugroups.m4 | 11 +
m4/gnulib-cache.m4 | 164 +
m4/gnulib-common.m4 | 459 +
m4/gnulib-comp.m4 | 1079 +
m4/gnulib-tool.m4 | 57 +
m4/hostent.m4 | 49 +
m4/include_next.m4 | 224 +
m4/inet_ntop.m4 | 70 +
m4/intmax_t.m4 | 59 +
m4/inttypes_h.m4 | 29 +
m4/ioctl.m4 | 44 +
m4/largefile.m4 | 177 +
m4/libtool.m4 | 8372 +++
m4/libunistring-base.m4 | 141 +
m4/limits-h.m4 | 43 +
m4/localcharset.m4 | 11 +
m4/locale_h.m4 | 158 +
m4/localeconv.m4 | 22 +
m4/lseek.m4 | 71 +
m4/ltoptions.m4 | 437 +
m4/ltsugar.m4 | 124 +
m4/ltversion.m4 | 23 +
m4/lt~obsolete.m4 | 99 +
m4/malloc.m4 | 104 +
m4/malloca.m4 | 14 +
m4/manywarnings-c++.m4 | 245 +
m4/manywarnings.m4 | 339 +
m4/math_h.m4 | 369 +
m4/memchr.m4 | 112 +
m4/mgetgroups.m4 | 10 +
m4/mmap-anon.m4 | 55 +
m4/mode_t.m4 | 26 +
m4/msvc-inval.m4 | 19 +
m4/msvc-nothrow.m4 | 10 +
m4/multiarch.m4 | 62 +
m4/net_if_h.m4 | 32 +
m4/netdb_h.m4 | 44 +
m4/netinet_in_h.m4 | 31 +
m4/nonblocking.m4 | 29 +
m4/off_t.m4 | 18 +
m4/open-cloexec.m4 | 21 +
m4/open-slash.m4 | 59 +
m4/open.m4 | 56 +
m4/passfd.m4 | 23 +
m4/pathmax.m4 | 42 +
m4/physmem.m4 | 46 +
m4/pipe.m4 | 15 +
m4/pipe2.m4 | 18 +
m4/poll.m4 | 107 +
m4/poll_h.m4 | 49 +
m4/posix-shell.m4 | 63 +
m4/posix_openpt.m4 | 19 +
m4/printf.m4 | 1692 +
m4/pthread_h.m4 | 268 +
m4/pthread_sigmask.m4 | 273 +
m4/pty.m4 | 160 +
m4/pty_h.m4 | 73 +
m4/raise.m4 | 36 +
m4/rawmemchr.m4 | 20 +
m4/realloc.m4 | 82 +
m4/sched_h.m4 | 91 +
m4/select.m4 | 116 +
m4/servent.m4 | 51 +
m4/sigaction.m4 | 40 +
m4/signal_h.m4 | 83 +
m4/signalblocking.m4 | 25 +
m4/sigpipe.m4 | 29 +
m4/size_max.m4 | 75 +
m4/snprintf.m4 | 62 +
m4/socketlib.m4 | 90 +
m4/sockets.m4 | 17 +
m4/socklen.m4 | 76 +
m4/sockpfaf.m4 | 84 +
m4/ssize_t.m4 | 23 +
m4/stat-time.m4 | 83 +
m4/stat.m4 | 74 +
m4/stdalign.m4 | 57 +
m4/stdbool.m4 | 122 +
m4/stddef_h.m4 | 72 +
m4/stdint.m4 | 535 +
m4/stdint_h.m4 | 27 +
m4/stdio_h.m4 | 225 +
m4/stdlib_h.m4 | 136 +
m4/strchrnul.m4 | 50 +
m4/strdup.m4 | 36 +
m4/string_h.m4 | 122 +
m4/strtok_r.m4 | 73 +
m4/sys_ioctl_h.m4 | 64 +
m4/sys_select_h.m4 | 95 +
m4/sys_socket_h.m4 | 188 +
m4/sys_stat_h.m4 | 100 +
m4/sys_time_h.m4 | 110 +
m4/sys_types_h.m4 | 60 +
m4/sys_uio_h.m4 | 31 +
m4/sys_utsname_h.m4 | 54 +
m4/sys_wait_h.m4 | 36 +
m4/termios_h.m4 | 43 +
m4/threadlib.m4 | 586 +
m4/time_h.m4 | 144 +
m4/time_r.m4 | 99 +
m4/ttyname_r.m4 | 133 +
m4/uname.m4 | 19 +
m4/unistd_h.m4 | 201 +
m4/vasnprintf.m4 | 288 +
m4/waitpid.m4 | 14 +
m4/warn-on-use.m4 | 51 +
m4/warnings.m4 | 115 +
m4/wchar_h.m4 | 241 +
m4/wchar_t.m4 | 24 +
m4/wctype_h.m4 | 216 +
m4/wcwidth.m4 | 131 +
m4/wint_t.m4 | 74 +
m4/xsize.m4 | 12 +
po/Makefile.in | 1880 +
po/POTFILES.in | 1 -
src/Makefile.in | 15853 ++++++
src/libvirt_private.syms | 5 +-
src/libxl/libxl_conf.c | 2 +-
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_process.c | 2 +-
src/qemu/qemu_tpm.c | 2 +-
src/secret/Makefile.inc.am | 11 -
src/secret/secret_util.c | 102 -
src/secret/secret_util.h | 33 -
src/storage/storage_backend_iscsi.c | 2 +-
src/storage/storage_backend_iscsi_direct.c | 2 +-
src/storage/storage_backend_rbd.c | 2 +-
src/storage/storage_util.c | 2 +-
src/util/virsecret.c | 69 +
src/util/virsecret.h | 8 +
tests/Makefile.in | 7562 +++
tools/Makefile.in | 3727 ++
358 files changed, 187869 insertions(+), 405 deletions(-)
create mode 100644 .git-module-status
create mode 100644 INSTALL
create mode 100644 Makefile.in
create mode 100644 aclocal.m4
create mode 100755 build-aux/compile
create mode 100755 build-aux/config.guess
create mode 100755 build-aux/config.sub
create mode 100755 build-aux/depcomp
create mode 100755 build-aux/install-sh
create mode 100644 build-aux/ltmain.sh
create mode 100755 build-aux/missing
create mode 100755 build-aux/test-driver
create mode 100644 config.h.in
create mode 100755 configure
create mode 100644 docs/Makefile.in
create mode 100644 examples/Makefile.in
create mode 100644 gnulib/lib/Makefile.in
create mode 100644 gnulib/lib/_Noreturn.h
create mode 100644 gnulib/lib/accept.c
create mode 100644 gnulib/lib/alloca.c
create mode 100644 gnulib/lib/alloca.in.h
create mode 100644 gnulib/lib/arg-nonnull.h
create mode 100644 gnulib/lib/arpa_inet.in.h
create mode 100644 gnulib/lib/asnprintf.c
create mode 100644 gnulib/lib/assure.h
create mode 100644 gnulib/lib/binary-io.c
create mode 100644 gnulib/lib/binary-io.h
create mode 100644 gnulib/lib/bind.c
create mode 100644 gnulib/lib/c++defs.h
create mode 100644 gnulib/lib/chown.c
create mode 100644 gnulib/lib/cloexec.c
create mode 100644 gnulib/lib/cloexec.h
create mode 100644 gnulib/lib/close.c
create mode 100644 gnulib/lib/connect.c
create mode 100644 gnulib/lib/dup2.c
create mode 100644 gnulib/lib/errno.in.h
create mode 100644 gnulib/lib/fchown-stub.c
create mode 100644 gnulib/lib/fcntl.c
create mode 100644 gnulib/lib/fcntl.in.h
create mode 100644 gnulib/lib/fd-hook.c
create mode 100644 gnulib/lib/fd-hook.h
create mode 100644 gnulib/lib/filename.h
create mode 100644 gnulib/lib/float+.h
create mode 100644 gnulib/lib/float.c
create mode 100644 gnulib/lib/float.in.h
create mode 100644 gnulib/lib/fseek.c
create mode 100644 gnulib/lib/fseeko.c
create mode 100644 gnulib/lib/fstat.c
create mode 100644 gnulib/lib/gai_strerror.c
create mode 100644 gnulib/lib/getaddrinfo.c
create mode 100644 gnulib/lib/getdelim.c
create mode 100644 gnulib/lib/getdtablesize.c
create mode 100644 gnulib/lib/getgroups.c
create mode 100644 gnulib/lib/gethostname.c
create mode 100644 gnulib/lib/getline.c
create mode 100644 gnulib/lib/getpass.c
create mode 100644 gnulib/lib/getpass.h
create mode 100644 gnulib/lib/getpeername.c
create mode 100644 gnulib/lib/getsockname.c
create mode 100644 gnulib/lib/gettext.h
create mode 100644 gnulib/lib/getugroups.c
create mode 100644 gnulib/lib/getugroups.h
create mode 100644 gnulib/lib/glthread/threadlib.c
create mode 100644 gnulib/lib/gnulib.mk
create mode 100644 gnulib/lib/inet_ntop.c
create mode 100644 gnulib/lib/intprops.h
create mode 100644 gnulib/lib/ioctl.c
create mode 100644 gnulib/lib/itold.c
create mode 100644 gnulib/lib/limits.in.h
create mode 100644 gnulib/lib/listen.c
create mode 100644 gnulib/lib/localcharset.c
create mode 100644 gnulib/lib/localcharset.h
create mode 100644 gnulib/lib/locale.in.h
create mode 100644 gnulib/lib/localeconv.c
create mode 100644 gnulib/lib/lseek.c
create mode 100644 gnulib/lib/malloc.c
create mode 100644 gnulib/lib/malloca.c
create mode 100644 gnulib/lib/malloca.h
create mode 100644 gnulib/lib/memchr.c
create mode 100644 gnulib/lib/memchr.valgrind
create mode 100644 gnulib/lib/mgetgroups.c
create mode 100644 gnulib/lib/mgetgroups.h
create mode 100644 gnulib/lib/msvc-inval.c
create mode 100644 gnulib/lib/msvc-inval.h
create mode 100644 gnulib/lib/msvc-nothrow.c
create mode 100644 gnulib/lib/msvc-nothrow.h
create mode 100644 gnulib/lib/net_if.in.h
create mode 100644 gnulib/lib/netdb.in.h
create mode 100644 gnulib/lib/netinet_in.in.h
create mode 100644 gnulib/lib/nonblocking.c
create mode 100644 gnulib/lib/nonblocking.h
create mode 100644 gnulib/lib/open.c
create mode 100644 gnulib/lib/openpty.c
create mode 100644 gnulib/lib/passfd.c
create mode 100644 gnulib/lib/passfd.h
create mode 100644 gnulib/lib/pathmax.h
create mode 100644 gnulib/lib/physmem.c
create mode 100644 gnulib/lib/physmem.h
create mode 100644 gnulib/lib/pipe.c
create mode 100644 gnulib/lib/pipe2.c
create mode 100644 gnulib/lib/poll.c
create mode 100644 gnulib/lib/poll.in.h
create mode 100644 gnulib/lib/posix_openpt.c
create mode 100644 gnulib/lib/printf-args.c
create mode 100644 gnulib/lib/printf-args.h
create mode 100644 gnulib/lib/printf-parse.c
create mode 100644 gnulib/lib/printf-parse.h
create mode 100644 gnulib/lib/pthread.in.h
create mode 100644 gnulib/lib/pthread_sigmask.c
create mode 100644 gnulib/lib/pty.in.h
create mode 100644 gnulib/lib/raise.c
create mode 100644 gnulib/lib/rawmemchr.c
create mode 100644 gnulib/lib/rawmemchr.valgrind
create mode 100644 gnulib/lib/realloc.c
create mode 100644 gnulib/lib/recv.c
create mode 100644 gnulib/lib/sched.in.h
create mode 100644 gnulib/lib/select.c
create mode 100644 gnulib/lib/send.c
create mode 100644 gnulib/lib/setsockopt.c
create mode 100644 gnulib/lib/sig-handler.c
create mode 100644 gnulib/lib/sig-handler.h
create mode 100644 gnulib/lib/sigaction.c
create mode 100644 gnulib/lib/signal.in.h
create mode 100644 gnulib/lib/sigprocmask.c
create mode 100644 gnulib/lib/size_max.h
create mode 100644 gnulib/lib/snprintf.c
create mode 100644 gnulib/lib/socket.c
create mode 100644 gnulib/lib/sockets.c
create mode 100644 gnulib/lib/sockets.h
create mode 100644 gnulib/lib/stat-time.c
create mode 100644 gnulib/lib/stat-time.h
create mode 100644 gnulib/lib/stat-w32.c
create mode 100644 gnulib/lib/stat-w32.h
create mode 100644 gnulib/lib/stat.c
create mode 100644 gnulib/lib/stdalign.in.h
create mode 100644 gnulib/lib/stdbool.in.h
create mode 100644 gnulib/lib/stddef.in.h
create mode 100644 gnulib/lib/stdint.in.h
create mode 100644 gnulib/lib/stdio-impl.h
create mode 100644 gnulib/lib/stdio-read.c
create mode 100644 gnulib/lib/stdio-write.c
create mode 100644 gnulib/lib/stdio.in.h
create mode 100644 gnulib/lib/stdlib.in.h
create mode 100644 gnulib/lib/strchrnul.c
create mode 100644 gnulib/lib/strchrnul.valgrind
create mode 100644 gnulib/lib/strdup.c
create mode 100644 gnulib/lib/streq.h
create mode 100644 gnulib/lib/string.in.h
create mode 100644 gnulib/lib/strtok_r.c
create mode 100644 gnulib/lib/sys_ioctl.in.h
create mode 100644 gnulib/lib/sys_select.in.h
create mode 100644 gnulib/lib/sys_socket.c
create mode 100644 gnulib/lib/sys_socket.in.h
create mode 100644 gnulib/lib/sys_stat.in.h
create mode 100644 gnulib/lib/sys_time.in.h
create mode 100644 gnulib/lib/sys_types.in.h
create mode 100644 gnulib/lib/sys_uio.in.h
create mode 100644 gnulib/lib/sys_utsname.in.h
create mode 100644 gnulib/lib/sys_wait.in.h
create mode 100644 gnulib/lib/termios.in.h
create mode 100644 gnulib/lib/time.in.h
create mode 100644 gnulib/lib/time_r.c
create mode 100644 gnulib/lib/ttyname_r.c
create mode 100644 gnulib/lib/uname.c
create mode 100644 gnulib/lib/unistd.c
create mode 100644 gnulib/lib/unistd.in.h
create mode 100644 gnulib/lib/unitypes.in.h
create mode 100644 gnulib/lib/uniwidth.in.h
create mode 100644 gnulib/lib/uniwidth/cjk.h
create mode 100644 gnulib/lib/uniwidth/width.c
create mode 100644 gnulib/lib/vasnprintf.c
create mode 100644 gnulib/lib/vasnprintf.h
create mode 100644 gnulib/lib/verify.h
create mode 100644 gnulib/lib/w32sock.h
create mode 100644 gnulib/lib/waitpid.c
create mode 100644 gnulib/lib/warn-on-use.h
create mode 100644 gnulib/lib/wchar.in.h
create mode 100644 gnulib/lib/wctype-h.c
create mode 100644 gnulib/lib/wctype.in.h
create mode 100644 gnulib/lib/wcwidth.c
create mode 100644 gnulib/lib/xalloc-oversized.h
create mode 100644 gnulib/lib/xsize.c
create mode 100644 gnulib/lib/xsize.h
delete mode 100644 gnulib/tests/Makefile.am
create mode 100644 include/libvirt/Makefile.in
create mode 100644 m4/00gnulib.m4
create mode 100644 m4/absolute-header.m4
create mode 100644 m4/alloca.m4
create mode 100644 m4/arpa_inet_h.m4
create mode 100644 m4/asm-underscore.m4
create mode 100644 m4/chown.m4
create mode 100644 m4/close.m4
create mode 100644 m4/codeset.m4
create mode 100644 m4/configmake.m4
create mode 100644 m4/dup2.m4
create mode 100644 m4/eealloc.m4
create mode 100644 m4/environ.m4
create mode 100644 m4/errno_h.m4
create mode 100644 m4/exponentd.m4
create mode 100644 m4/extensions.m4
create mode 100644 m4/extern-inline.m4
create mode 100644 m4/fcntl-o.m4
create mode 100644 m4/fcntl.m4
create mode 100644 m4/fcntl_h.m4
create mode 100644 m4/float_h.m4
create mode 100644 m4/fseek.m4
create mode 100644 m4/fseeko.m4
create mode 100644 m4/fstat.m4
create mode 100644 m4/getaddrinfo.m4
create mode 100644 m4/getdelim.m4
create mode 100644 m4/getdtablesize.m4
create mode 100644 m4/getgroups.m4
create mode 100644 m4/gethostname.m4
create mode 100644 m4/getline.m4
create mode 100644 m4/getpass.m4
create mode 100644 m4/getugroups.m4
create mode 100644 m4/gnulib-cache.m4
create mode 100644 m4/gnulib-common.m4
create mode 100644 m4/gnulib-comp.m4
create mode 100644 m4/gnulib-tool.m4
create mode 100644 m4/hostent.m4
create mode 100644 m4/include_next.m4
create mode 100644 m4/inet_ntop.m4
create mode 100644 m4/intmax_t.m4
create mode 100644 m4/inttypes_h.m4
create mode 100644 m4/ioctl.m4
create mode 100644 m4/largefile.m4
create mode 100644 m4/libtool.m4
create mode 100644 m4/libunistring-base.m4
create mode 100644 m4/limits-h.m4
create mode 100644 m4/localcharset.m4
create mode 100644 m4/locale_h.m4
create mode 100644 m4/localeconv.m4
create mode 100644 m4/lseek.m4
create mode 100644 m4/ltoptions.m4
create mode 100644 m4/ltsugar.m4
create mode 100644 m4/ltversion.m4
create mode 100644 m4/lt~obsolete.m4
create mode 100644 m4/malloc.m4
create mode 100644 m4/malloca.m4
create mode 100644 m4/manywarnings-c++.m4
create mode 100644 m4/manywarnings.m4
create mode 100644 m4/math_h.m4
create mode 100644 m4/memchr.m4
create mode 100644 m4/mgetgroups.m4
create mode 100644 m4/mmap-anon.m4
create mode 100644 m4/mode_t.m4
create mode 100644 m4/msvc-inval.m4
create mode 100644 m4/msvc-nothrow.m4
create mode 100644 m4/multiarch.m4
create mode 100644 m4/net_if_h.m4
create mode 100644 m4/netdb_h.m4
create mode 100644 m4/netinet_in_h.m4
create mode 100644 m4/nonblocking.m4
create mode 100644 m4/off_t.m4
create mode 100644 m4/open-cloexec.m4
create mode 100644 m4/open-slash.m4
create mode 100644 m4/open.m4
create mode 100644 m4/passfd.m4
create mode 100644 m4/pathmax.m4
create mode 100644 m4/physmem.m4
create mode 100644 m4/pipe.m4
create mode 100644 m4/pipe2.m4
create mode 100644 m4/poll.m4
create mode 100644 m4/poll_h.m4
create mode 100644 m4/posix-shell.m4
create mode 100644 m4/posix_openpt.m4
create mode 100644 m4/printf.m4
create mode 100644 m4/pthread_h.m4
create mode 100644 m4/pthread_sigmask.m4
create mode 100644 m4/pty.m4
create mode 100644 m4/pty_h.m4
create mode 100644 m4/raise.m4
create mode 100644 m4/rawmemchr.m4
create mode 100644 m4/realloc.m4
create mode 100644 m4/sched_h.m4
create mode 100644 m4/select.m4
create mode 100644 m4/servent.m4
create mode 100644 m4/sigaction.m4
create mode 100644 m4/signal_h.m4
create mode 100644 m4/signalblocking.m4
create mode 100644 m4/sigpipe.m4
create mode 100644 m4/size_max.m4
create mode 100644 m4/snprintf.m4
create mode 100644 m4/socketlib.m4
create mode 100644 m4/sockets.m4
create mode 100644 m4/socklen.m4
create mode 100644 m4/sockpfaf.m4
create mode 100644 m4/ssize_t.m4
create mode 100644 m4/stat-time.m4
create mode 100644 m4/stat.m4
create mode 100644 m4/stdalign.m4
create mode 100644 m4/stdbool.m4
create mode 100644 m4/stddef_h.m4
create mode 100644 m4/stdint.m4
create mode 100644 m4/stdint_h.m4
create mode 100644 m4/stdio_h.m4
create mode 100644 m4/stdlib_h.m4
create mode 100644 m4/strchrnul.m4
create mode 100644 m4/strdup.m4
create mode 100644 m4/string_h.m4
create mode 100644 m4/strtok_r.m4
create mode 100644 m4/sys_ioctl_h.m4
create mode 100644 m4/sys_select_h.m4
create mode 100644 m4/sys_socket_h.m4
create mode 100644 m4/sys_stat_h.m4
create mode 100644 m4/sys_time_h.m4
create mode 100644 m4/sys_types_h.m4
create mode 100644 m4/sys_uio_h.m4
create mode 100644 m4/sys_utsname_h.m4
create mode 100644 m4/sys_wait_h.m4
create mode 100644 m4/termios_h.m4
create mode 100644 m4/threadlib.m4
create mode 100644 m4/time_h.m4
create mode 100644 m4/time_r.m4
create mode 100644 m4/ttyname_r.m4
create mode 100644 m4/uname.m4
create mode 100644 m4/unistd_h.m4
create mode 100644 m4/vasnprintf.m4
create mode 100644 m4/waitpid.m4
create mode 100644 m4/warn-on-use.m4
create mode 100644 m4/warnings.m4
create mode 100644 m4/wchar_h.m4
create mode 100644 m4/wchar_t.m4
create mode 100644 m4/wctype_h.m4
create mode 100644 m4/wcwidth.m4
create mode 100644 m4/wint_t.m4
create mode 100644 m4/xsize.m4
create mode 100644 po/Makefile.in
create mode 100644 src/Makefile.in
delete mode 100644 src/secret/secret_util.c
delete mode 100644 src/secret/secret_util.h
create mode 100644 tests/Makefile.in
create mode 100644 tools/Makefile.in
--
2.24.1
4 years, 10 months
[libvirt] [jenkins-ci PATCH] guests: Fix indentation in README
by Andrea Bolognani
Text that we want to show up as monospace needs to be indented
by at least four spaces.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
Pushed as trivial.
guests/README.markdown | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/guests/README.markdown b/guests/README.markdown
index d10727c..f225da7 100644
--- a/guests/README.markdown
+++ b/guests/README.markdown
@@ -159,14 +159,14 @@ the official qcow2 images can be used to quickly bring up such guests.
The default qcow2 images are sized too small to be usable. To enlarge
them do
- $ virsh blockresize libvirt-freebsd-$MAJOR \
- /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2 15G
+ $ virsh blockresize libvirt-freebsd-$MAJOR \
+ /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2 15G
Then inside the guest, as root, enlarge the 3rd partition & filesystem
to consume all new space:
- # gpart resize -i 3 vtbd0
- # service growfs onestart
+ # gpart resize -i 3 vtbd0
+ # service growfs onestart
Some manual tweaking will be needed, in particular:
--
2.24.1
4 years, 10 months
[libvirt] [PATCH 0/5] introduce support for CPU dies in host/guest topology
by Daniel P. Berrangé
Latest generation CPUs (CascadeLake-AP) support a new topology level
known as a 'die', sitting between a socket and a core.
QEMU supports this with -smp arg since 4.1.0
Linux can report this via /sys/devices/system/cpu/cpuNNN/topology
via 'die_id' and 'die_cpus' and 'die_cpus_list' files since 5.2
This series adds support for <topology> in guest XML to have a new
'dies' parameter, passed to QEMU, which defaults to '1' if omitted.
It extends host capabilities so that NUMA topology reports a new
'die_id' attribute
We can't expand 'virNodeInfoPtr' struct to have a die field, so
this will remain forever reporting 'cores' as being 'dies * cores'.
The <topology> in host capabilities XML is an interesting question.
If we are strict with our API semantics we would *not* add a 'dies'
parameter with any value other than '1' to <topology> in the host
capabilities. If we reported a value other than 1, then any existing
apps which multiple sockets*cores*threads will get the wrong total
CPU count.
We already know <topology> is broken by design for asymetric
hardware, so we could simply document that it will forever be broken
wrt to CPU dies too. In this case we might be better to not even
report 'dies=1', just leave out the attr entirely.
Interestingly though, <topology> is already more broken than it
should be. For a VM with -smp 12,sockets=2,dies=3,cores=2,threads=1
it is reporting <topology sockets=1 dies=1 cores=12 threads=1>.
It should at least do <topology sockets=2 dies=1 cores=6 threads=1>.
I suspect the presence of dies is confusing the really incredibly
horrible logic in virHostCPUGetInfoLinux. This will also impact
virNodeInfoPtr data.
So even if we don't report dies, I think we still have a bug that
needs fixing here for the coarse node topology.
I'm also confused about what I see with EPYC. IIUC, it was supposed
to use the 'dies' concept, but in machines I've tested, Linux never
reports die count other than 1. Perhaps only certain EPYC CPU
models or generations use 'dies', or perhaps Linux isn't reporting
correctly for EPYC, or perhaps I'm mislead into believeing it uses
dies.
Anyway, the upshot is I've not found any real hardware to test this
series on. I've tested it only inside a QEMU guest with the suitable
-smp arg to fake dies.
Daniel P. Berrangé (5):
conf: add support for specifying CPU "dies" parameter
conf: remove unused virCapabilitiesSetHostCPU method
qemu: add support for specifying CPU "dies" topology parameter
hostcpu: add support for reporting die_id in NUMA topology
tests: add host CPU data files for validating die_id
docs/formatcaps.html.in | 2 +-
docs/formatdomain.html.in | 14 +-
docs/schemas/capability.rng | 3 +
docs/schemas/cputypes.rng | 5 +
src/bhyve/bhyve_command.c | 5 +
src/conf/capabilities.c | 26 +-
src/conf/capabilities.h | 7 +-
src/conf/cpu_conf.c | 18 +-
src/conf/cpu_conf.h | 1 +
src/conf/domain_conf.c | 3 +-
src/cpu/cpu.c | 1 +
src/libvirt_linux.syms | 1 +
src/libvirt_private.syms | 1 -
src/libxl/libxl_capabilities.c | 1 +
src/qemu/qemu_capabilities.c | 2 +
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_command.c | 12 +-
src/util/virhostcpu.c | 16 +
src/util/virhostcpu.h | 1 +
src/vmx/vmx.c | 7 +
.../x86_64-host+guest,model486-result.xml | 2 +-
.../x86_64-host+guest,models-result.xml | 2 +-
.../cputestdata/x86_64-host+guest-result.xml | 2 +-
tests/cputestdata/x86_64-host+guest.xml | 2 +-
.../x86_64-host+host-model-nofallback.xml | 2 +-
...t-Haswell-noTSX+Haswell,haswell-result.xml | 2 +-
...ell-noTSX+Haswell-noTSX,haswell-result.xml | 2 +-
...ost-Haswell-noTSX+Haswell-noTSX-result.xml | 2 +-
.../x86_64-host-worse+guest-result.xml | 2 +-
.../caps_4.1.0.x86_64.xml | 1 +
.../caps_4.2.0.aarch64.xml | 1 +
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 +
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 +
.../caps_4.2.0.x86_64.xml | 1 +
.../ppc64-modern-bulk-result-conf.xml | 2 +-
.../ppc64-modern-bulk-result-live.xml | 2 +-
.../ppc64-modern-individual-result-conf.xml | 2 +-
.../ppc64-modern-individual-result-live.xml | 2 +-
.../x86-modern-bulk-result-conf.xml | 2 +-
.../x86-modern-bulk-result-live.xml | 2 +-
.../x86-modern-individual-add-result-conf.xml | 2 +-
.../x86-modern-individual-add-result-live.xml | 2 +-
.../x86-old-bulk-result-conf.xml | 2 +-
.../x86-old-bulk-result-live.xml | 2 +-
.../cpu-hotplug-granularity.xml | 2 +-
.../qemuxml2argvdata/cpu-hotplug-startup.xml | 2 +-
tests/qemuxml2argvdata/cpu-numa-disjoint.xml | 2 +-
.../qemuxml2argvdata/cpu-numa-disordered.xml | 2 +-
tests/qemuxml2argvdata/cpu-numa-memshared.xml | 2 +-
.../cpu-numa-no-memory-element.xml | 2 +-
tests/qemuxml2argvdata/cpu-numa1.xml | 2 +-
tests/qemuxml2argvdata/cpu-numa2.xml | 2 +-
tests/qemuxml2argvdata/cpu-numa3.xml | 2 +-
tests/qemuxml2argvdata/cpu-topology1.xml | 2 +-
tests/qemuxml2argvdata/cpu-topology2.xml | 2 +-
tests/qemuxml2argvdata/cpu-topology3.xml | 2 +-
.../fd-memory-no-numa-topology.xml | 2 +-
.../fd-memory-numa-topology.xml | 2 +-
.../fd-memory-numa-topology2.xml | 2 +-
.../fd-memory-numa-topology3.xml | 2 +-
.../graphics-spice-timeout.xml | 2 +-
.../hugepages-nvdimm.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/hugepages-nvdimm.xml | 2 +-
...memory-default-hugepage.x86_64-latest.args | 2 +-
.../memfd-memory-default-hugepage.xml | 2 +-
.../memfd-memory-numa.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/memfd-memory-numa.xml | 2 +-
tests/qemuxml2argvdata/memory-align-fail.xml | 2 +-
.../memory-hotplug-dimm-addr.xml | 2 +-
.../qemuxml2argvdata/memory-hotplug-dimm.xml | 2 +-
...y-hotplug-nvdimm-access.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-access.xml | 2 +-
...ry-hotplug-nvdimm-align.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-align.xml | 2 +-
...ry-hotplug-nvdimm-label.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-label.xml | 2 +-
...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-pmem.xml | 2 +-
...hotplug-nvdimm-readonly.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-readonly.xml | 2 +-
.../memory-hotplug-nvdimm.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm.xml | 2 +-
tests/qemuxml2argvdata/memory-hotplug.xml | 2 +-
.../numad-auto-memory-vcpu-cpuset.xml | 2 +-
...to-memory-vcpu-no-cpuset-and-placement.xml | 2 +-
.../numad-auto-vcpu-no-numatune.xml | 2 +-
...d-auto-vcpu-static-numatune-no-nodeset.xml | 2 +-
.../numad-auto-vcpu-static-numatune.xml | 2 +-
.../numad-static-memory-auto-vcpu.xml | 2 +-
.../numad-static-vcpu-no-numatune.xml | 2 +-
tests/qemuxml2argvdata/numad.xml | 2 +-
.../numatune-auto-nodeset-invalid.xml | 2 +-
.../numatune-memory-invalid-nodeset.xml | 2 +-
tests/qemuxml2argvdata/numatune-memory.xml | 2 +-
.../pci-expander-bus-bad-machine.xml | 2 +-
tests/qemuxml2argvdata/pci-expander-bus.xml | 2 +-
.../pcie-expander-bus-bad-bus.xml | 2 +-
.../pcie-expander-bus-bad-machine.xml | 2 +-
tests/qemuxml2argvdata/pcie-expander-bus.xml | 2 +-
.../pseries-default-phb-numa-node.xml | 2 +-
.../pseries-phb-numa-node.xml | 2 +-
tests/qemuxml2argvdata/smp-dies.args | 29 ++
tests/qemuxml2argvdata/smp-dies.xml | 33 ++
tests/qemuxml2argvdata/smp.xml | 2 +-
tests/qemuxml2argvtest.c | 1 +
.../qemuxml2xmloutdata/cpu-numa-disjoint.xml | 2 +-
.../cpu-numa-disordered.xml | 2 +-
.../qemuxml2xmloutdata/cpu-numa-memshared.xml | 2 +-
.../cpu-numa-no-memory-element.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-numa1.xml | 2 +-
tests/qemuxml2xmloutdata/cpu-numa2.xml | 2 +-
.../graphics-spice-timeout.xml | 2 +-
.../memory-hotplug-dimm.xml | 2 +-
tests/qemuxml2xmloutdata/memory-hotplug.xml | 2 +-
.../numad-auto-memory-vcpu-cpuset.xml | 2 +-
...to-memory-vcpu-no-cpuset-and-placement.xml | 2 +-
.../numad-auto-vcpu-no-numatune.xml | 2 +-
.../numad-static-vcpu-no-numatune.xml | 2 +-
tests/qemuxml2xmloutdata/pci-expander-bus.xml | 2 +-
.../qemuxml2xmloutdata/pcie-expander-bus.xml | 2 +-
.../pseries-phb-numa-node.xml | 2 +-
tests/qemuxml2xmloutdata/smp.xml | 2 +-
.../linux-basic-dies/system/cpu | 1 +
.../linux-basic-dies/system/node | 1 +
.../vircaps2xmldata/vircaps-aarch64-basic.xml | 32 +-
.../vircaps-x86_64-basic-dies.xml | 35 ++
.../vircaps2xmldata/vircaps-x86_64-basic.xml | 32 +-
.../vircaps2xmldata/vircaps-x86_64-caches.xml | 16 +-
.../vircaps-x86_64-resctrl-cdp.xml | 24 +-
.../vircaps-x86_64-resctrl-cmt.xml | 24 +-
.../vircaps-x86_64-resctrl-fake-feature.xml | 24 +-
.../vircaps-x86_64-resctrl-skx-twocaches.xml | 2 +-
.../vircaps-x86_64-resctrl-skx.xml | 2 +-
.../vircaps-x86_64-resctrl.xml | 24 +-
tests/vircaps2xmltest.c | 1 +
.../cpu/cpu0/topology/core_cpus | 1 +
.../cpu/cpu0/topology/core_cpus_list | 1 +
.../linux-with-die/cpu/cpu0/topology/core_id | 1 +
.../cpu/cpu0/topology/core_siblings | 1 +
.../cpu/cpu0/topology/core_siblings_list | 1 +
.../linux-with-die/cpu/cpu0/topology/die_cpus | 1 +
.../cpu/cpu0/topology/die_cpus_list | 1 +
.../linux-with-die/cpu/cpu0/topology/die_id | 1 +
.../cpu/cpu0/topology/package_cpus | 1 +
.../cpu/cpu0/topology/package_cpus_list | 1 +
.../cpu/cpu0/topology/physical_package_id | 1 +
.../cpu/cpu0/topology/thread_siblings | 1 +
.../cpu/cpu0/topology/thread_siblings_list | 1 +
.../linux-with-die/cpu/cpu1/online | 1 +
.../cpu/cpu1/topology/core_cpus | 1 +
.../cpu/cpu1/topology/core_cpus_list | 1 +
.../linux-with-die/cpu/cpu1/topology/core_id | 1 +
.../cpu/cpu1/topology/core_siblings | 1 +
.../cpu/cpu1/topology/core_siblings_list | 1 +
.../linux-with-die/cpu/cpu1/topology/die_cpus | 1 +
.../cpu/cpu1/topology/die_cpus_list | 1 +
.../linux-with-die/cpu/cpu1/topology/die_id | 1 +
.../cpu/cpu1/topology/package_cpus | 1 +
.../cpu/cpu1/topology/package_cpus_list | 1 +
.../cpu/cpu1/topology/physical_package_id | 1 +
.../cpu/cpu1/topology/thread_siblings | 1 +
.../cpu/cpu1/topology/thread_siblings_list | 1 +
.../linux-with-die/cpu/cpu10/online | 1 +
.../cpu/cpu10/topology/core_cpus | 1 +
.../cpu/cpu10/topology/core_cpus_list | 1 +
.../linux-with-die/cpu/cpu10/topology/core_id | 1 +
.../cpu/cpu10/topology/core_siblings | 1 +
.../cpu/cpu10/topology/core_siblings_list | 1 +
.../cpu/cpu10/topology/die_cpus | 1 +
.../cpu/cpu10/topology/die_cpus_list | 1 +
.../linux-with-die/cpu/cpu10/topology/die_id | 1 +
.../cpu/cpu10/topology/package_cpus | 1 +
.../cpu/cpu10/topology/package_cpus_list | 1 +
.../cpu/cpu10/topology/physical_package_id | 1 +
.../cpu/cpu10/topology/thread_siblings | 1 +
.../cpu/cpu10/topology/thread_siblings_list | 1 +
.../linux-with-die/cpu/cpu11/online | 1 +
.../cpu/cpu11/topology/core_cpus | 1 +
.../cpu/cpu11/topology/core_cpus_list | 1 +
.../linux-with-die/cpu/cpu11/topology/core_id | 1 +
.../cpu/cpu11/topology/core_siblings | 1 +
.../cpu/cpu11/topology/core_siblings_list | 1 +
.../cpu/cpu11/topology/die_cpus | 1 +
.../cpu/cpu11/topology/die_cpus_list | 1 +
.../linux-with-die/cpu/cpu11/topology/die_id | 1 +
.../cpu/cpu11/topology/package_cpus | 1 +
.../cpu/cpu11/topology/package_cpus_list | 1 +
.../cpu/cpu11/topology/physical_package_id | 1 +
.../cpu/cpu11/topology/thread_siblings | 1 +
.../cpu/cpu11/topology/thread_siblings_list | 1 +
.../linux-with-die/cpu/cpu2/online | 1 +
.../cpu/cpu2/topology/core_cpus | 1 +
.../cpu/cpu2/topology/core_cpus_list | 1 +
.../linux-with-die/cpu/cpu2/topology/core_id | 1 +
.../cpu/cpu2/topology/core_siblings | 1 +
.../cpu/cpu2/topology/core_siblings_list | 1 +
.../linux-with-die/cpu/cpu2/topology/die_cpus | 1 +
.../cpu/cpu2/topology/die_cpus_list | 1 +
.../linux-with-die/cpu/cpu2/topology/die_id | 1 +
.../cpu/cpu2/topology/package_cpus | 1 +
.../cpu/cpu2/topology/package_cpus_list | 1 +
.../cpu/cpu2/topology/physical_package_id | 1 +
.../cpu/cpu2/topology/thread_siblings | 1 +
.../cpu/cpu2/topology/thread_siblings_list | 1 +
.../linux-with-die/cpu/cpu3/online | 1 +
.../cpu/cpu3/topology/core_cpus | 1 +
.../cpu/cpu3/topology/core_cpus_list | 1 +
.../linux-with-die/cpu/cpu3/topology/core_id | 1 +
.../cpu/cpu3/topology/core_siblings | 1 +
.../cpu/cpu3/topology/core_siblings_list | 1 +
.../linux-with-die/cpu/cpu3/topology/die_cpus | 1 +
.../cpu/cpu3/topology/die_cpus_list | 1 +
.../linux-with-die/cpu/cpu3/topology/die_id | 1 +
.../cpu/cpu3/topology/package_cpus | 1 +
.../cpu/cpu3/topology/package_cpus_list | 1 +
.../cpu/cpu3/topology/physical_package_id | 1 +
.../cpu/cpu3/topology/thread_siblings | 1 +
.../cpu/cpu3/topology/thread_siblings_list | 1 +
.../linux-with-die/cpu/cpu4/online | 1 +
.../cpu/cpu4/topology/core_cpus | 1 +
.../cpu/cpu4/topology/core_cpus_list | 1 +
.../linux-with-die/cpu/cpu4/topology/core_id | 1 +
.../cpu/cpu4/topology/core_siblings | 1 +
.../cpu/cpu4/topology/core_siblings_list | 1 +
.../linux-with-die/cpu/cpu4/topology/die_cpus | 1 +
.../cpu/cpu4/topology/die_cpus_list | 1 +
.../linux-with-die/cpu/cpu4/topology/die_id | 1 +
.../cpu/cpu4/topology/package_cpus | 1 +
.../cpu/cpu4/topology/package_cpus_list | 1 +
.../cpu/cpu4/topology/physical_package_id | 1 +
.../cpu/cpu4/topology/thread_siblings | 1 +
.../cpu/cpu4/topology/thread_siblings_list | 1 +
.../linux-with-die/cpu/cpu5/online | 1 +
.../cpu/cpu5/topology/core_cpus | 1 +
.../cpu/cpu5/topology/core_cpus_list | 1 +
.../linux-with-die/cpu/cpu5/topology/core_id | 1 +
.../cpu/cpu5/topology/core_siblings | 1 +
.../cpu/cpu5/topology/core_siblings_list | 1 +
.../linux-with-die/cpu/cpu5/topology/die_cpus | 1 +
.../cpu/cpu5/topology/die_cpus_list | 1 +
.../linux-with-die/cpu/cpu5/topology/die_id | 1 +
.../cpu/cpu5/topology/package_cpus | 1 +
.../cpu/cpu5/topology/package_cpus_list | 1 +
.../cpu/cpu5/topology/physical_package_id | 1 +
.../cpu/cpu5/topology/thread_siblings | 1 +
.../cpu/cpu5/topology/thread_siblings_list | 1 +
.../linux-with-die/cpu/cpu6/online | 1 +
.../cpu/cpu6/topology/core_cpus | 1 +
.../cpu/cpu6/topology/core_cpus_list | 1 +
.../linux-with-die/cpu/cpu6/topology/core_id | 1 +
.../cpu/cpu6/topology/core_siblings | 1 +
.../cpu/cpu6/topology/core_siblings_list | 1 +
.../linux-with-die/cpu/cpu6/topology/die_cpus | 1 +
.../cpu/cpu6/topology/die_cpus_list | 1 +
.../linux-with-die/cpu/cpu6/topology/die_id | 1 +
.../cpu/cpu6/topology/package_cpus | 1 +
.../cpu/cpu6/topology/package_cpus_list | 1 +
.../cpu/cpu6/topology/physical_package_id | 1 +
.../cpu/cpu6/topology/thread_siblings | 1 +
.../cpu/cpu6/topology/thread_siblings_list | 1 +
.../linux-with-die/cpu/cpu7/online | 1 +
.../cpu/cpu7/topology/core_cpus | 1 +
.../cpu/cpu7/topology/core_cpus_list | 1 +
.../linux-with-die/cpu/cpu7/topology/core_id | 1 +
.../cpu/cpu7/topology/core_siblings | 1 +
.../cpu/cpu7/topology/core_siblings_list | 1 +
.../linux-with-die/cpu/cpu7/topology/die_cpus | 1 +
.../cpu/cpu7/topology/die_cpus_list | 1 +
.../linux-with-die/cpu/cpu7/topology/die_id | 1 +
.../cpu/cpu7/topology/package_cpus | 1 +
.../cpu/cpu7/topology/package_cpus_list | 1 +
.../cpu/cpu7/topology/physical_package_id | 1 +
.../cpu/cpu7/topology/thread_siblings | 1 +
.../cpu/cpu7/topology/thread_siblings_list | 1 +
.../linux-with-die/cpu/cpu8/online | 1 +
.../cpu/cpu8/topology/core_cpus | 1 +
.../cpu/cpu8/topology/core_cpus_list | 1 +
.../linux-with-die/cpu/cpu8/topology/core_id | 1 +
.../cpu/cpu8/topology/core_siblings | 1 +
.../cpu/cpu8/topology/core_siblings_list | 1 +
.../linux-with-die/cpu/cpu8/topology/die_cpus | 1 +
.../cpu/cpu8/topology/die_cpus_list | 1 +
.../linux-with-die/cpu/cpu8/topology/die_id | 1 +
.../cpu/cpu8/topology/package_cpus | 1 +
.../cpu/cpu8/topology/package_cpus_list | 1 +
.../cpu/cpu8/topology/physical_package_id | 1 +
.../cpu/cpu8/topology/thread_siblings | 1 +
.../cpu/cpu8/topology/thread_siblings_list | 1 +
.../linux-with-die/cpu/cpu9/online | 1 +
.../cpu/cpu9/topology/core_cpus | 1 +
.../cpu/cpu9/topology/core_cpus_list | 1 +
.../linux-with-die/cpu/cpu9/topology/core_id | 1 +
.../cpu/cpu9/topology/core_siblings | 1 +
.../cpu/cpu9/topology/core_siblings_list | 1 +
.../linux-with-die/cpu/cpu9/topology/die_cpus | 1 +
.../cpu/cpu9/topology/die_cpus_list | 1 +
.../linux-with-die/cpu/cpu9/topology/die_id | 1 +
.../cpu/cpu9/topology/package_cpus | 1 +
.../cpu/cpu9/topology/package_cpus_list | 1 +
.../cpu/cpu9/topology/physical_package_id | 1 +
.../cpu/cpu9/topology/thread_siblings | 1 +
.../cpu/cpu9/topology/thread_siblings_list | 1 +
.../virhostcpudata/linux-with-die/cpu/online | 1 +
.../virhostcpudata/linux-with-die/cpu/present | 1 +
.../linux-with-die/node/node0/cpu0 | 1 +
.../linux-with-die/node/node0/cpu1 | 1 +
.../linux-with-die/node/node0/cpu10 | 1 +
.../linux-with-die/node/node0/cpu11 | 1 +
.../linux-with-die/node/node0/cpu2 | 1 +
.../linux-with-die/node/node0/cpu3 | 1 +
.../linux-with-die/node/node0/cpu4 | 1 +
.../linux-with-die/node/node0/cpu5 | 1 +
.../linux-with-die/node/node0/cpu6 | 1 +
.../linux-with-die/node/node0/cpu7 | 1 +
.../linux-with-die/node/node0/cpu8 | 1 +
.../linux-with-die/node/node0/cpu9 | 1 +
.../linux-with-die/node/node0/cpulist | 1 +
.../virhostcpudata/linux-with-die/node/online | 1 +
.../linux-with-die/node/possible | 1 +
.../linux-x86_64-with-die.cpuinfo | 324 ++++++++++++++++++
.../linux-x86_64-with-die.expected | 1 +
tests/virhostcputest.c | 1 +
.../vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml | 2 +-
.../vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml | 2 +-
324 files changed, 887 insertions(+), 228 deletions(-)
create mode 100644 tests/qemuxml2argvdata/smp-dies.args
create mode 100644 tests/qemuxml2argvdata/smp-dies.xml
create mode 120000 tests/vircaps2xmldata/linux-basic-dies/system/cpu
create mode 120000 tests/vircaps2xmldata/linux-basic-dies/system/node
create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/online
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/online
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/online
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/online
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/online
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/online
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/online
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/online
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/online
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/online
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/online
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings_list
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/online
create mode 100644 tests/virhostcpudata/linux-with-die/cpu/present
create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu0
create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu1
create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu10
create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu11
create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu2
create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu3
create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu4
create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu5
create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu6
create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu7
create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu8
create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu9
create mode 100644 tests/virhostcpudata/linux-with-die/node/node0/cpulist
create mode 100644 tests/virhostcpudata/linux-with-die/node/online
create mode 100644 tests/virhostcpudata/linux-with-die/node/possible
create mode 100644 tests/virhostcpudata/linux-x86_64-with-die.cpuinfo
create mode 100644 tests/virhostcpudata/linux-x86_64-with-die.expected
--
2.23.0
4 years, 10 months
[libvirt] [jenkins-ci PATCH v3 0/7] Add support for gtk-vnc builds
by Daniel P. Berrangé
Support gtk-vnc and make virt-viewer depend on it
I sent this months ago & forgot to push it. Re-sending just in
case something has invalidated any patches. I've at least added
the newer distros
This time with gdk-pixbuf added and previous suggested fixes
Daniel P. Berrangé (7):
mappings: add libgcrypt
mappings: add PulseAudio
mappings: add gdk-pixbuf
guests: pull in deps for gtk-vnc project
projects: add gtk-vnc project
projects: make virt-viewer depend on gtk-vnc jobs
mappings: remove gtk-vnc2
guests/host_vars/libvirt-centos-7/main.yml | 1 +
guests/host_vars/libvirt-centos-8/main.yml | 1 +
guests/host_vars/libvirt-debian-10/main.yml | 1 +
guests/host_vars/libvirt-debian-9/main.yml | 1 +
guests/host_vars/libvirt-debian-sid/main.yml | 1 +
guests/host_vars/libvirt-fedora-30/main.yml | 3 ++
guests/host_vars/libvirt-fedora-31/main.yml | 1 +
.../host_vars/libvirt-fedora-rawhide/main.yml | 1 +
guests/host_vars/libvirt-freebsd-11/main.yml | 1 +
guests/host_vars/libvirt-freebsd-12/main.yml | 1 +
.../libvirt-freebsd-current/main.yml | 1 +
guests/host_vars/libvirt-ubuntu-1604/main.yml | 1 +
guests/host_vars/libvirt-ubuntu-1804/main.yml | 1 +
guests/playbooks/build/jobs/defaults.yml | 3 ++
.../build/projects/gtk-vnc+mingw32.yml | 12 ++++++
.../build/projects/gtk-vnc+mingw64.yml | 12 ++++++
guests/playbooks/build/projects/gtk-vnc.yml | 19 +++++++++
guests/vars/mappings.yml | 42 +++++++++++++------
guests/vars/projects/gtk-vnc+mingw32.yml | 7 ++++
guests/vars/projects/gtk-vnc+mingw64.yml | 7 ++++
guests/vars/projects/gtk-vnc.yml | 12 ++++++
guests/vars/projects/virt-viewer+mingw32.yml | 1 -
guests/vars/projects/virt-viewer+mingw64.yml | 1 -
guests/vars/projects/virt-viewer.yml | 1 -
jenkins/jobs/defaults.yaml | 3 ++
jenkins/projects/gtk-vnc+mingw32.yaml | 12 ++++++
jenkins/projects/gtk-vnc+mingw64.yaml | 12 ++++++
jenkins/projects/gtk-vnc.yaml | 15 +++++++
jenkins/projects/virt-viewer+mingw32.yaml | 4 +-
jenkins/projects/virt-viewer+mingw64.yaml | 4 +-
jenkins/projects/virt-viewer.yaml | 4 +-
31 files changed, 167 insertions(+), 19 deletions(-)
create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw32.yml
create mode 100644 guests/playbooks/build/projects/gtk-vnc+mingw64.yml
create mode 100644 guests/playbooks/build/projects/gtk-vnc.yml
create mode 100644 guests/vars/projects/gtk-vnc+mingw32.yml
create mode 100644 guests/vars/projects/gtk-vnc+mingw64.yml
create mode 100644 guests/vars/projects/gtk-vnc.yml
create mode 100644 jenkins/projects/gtk-vnc+mingw32.yaml
create mode 100644 jenkins/projects/gtk-vnc+mingw64.yaml
create mode 100644 jenkins/projects/gtk-vnc.yaml
--
2.23.0
4 years, 10 months
[libvirt] [PATCH] schema: Allow iSCSI source to have interleaved children
by Michal Privoznik
There is no need to require users to produce iSCSI disk source
following our ordering of children elements. In fact, we don't
even accept our own order in the schema :(.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
docs/schemas/domaincommon.rng | 24 ++++++++++---------
.../disk-network-iscsi-modern.args | 9 ++++++-
.../disk-network-iscsi-modern.xml | 13 ++++++++++
3 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 9b555d6acb..76d94b156f 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1772,17 +1772,19 @@
<value>iscsi</value>
</attribute>
<attribute name="name"/>
- <ref name="diskSourceCommon"/>
- <ref name="diskSourceNetworkHost"/>
- <optional>
- <ref name="diskAuth"/>
- </optional>
- <optional>
- <ref name="encryption"/>
- </optional>
- <optional>
- <ref name="initiatorinfo"/>
- </optional>
+ <interleave>
+ <ref name="diskSourceCommon"/>
+ <ref name="diskSourceNetworkHost"/>
+ <optional>
+ <ref name="diskAuth"/>
+ </optional>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
+ <optional>
+ <ref name="initiatorinfo"/>
+ </optional>
+ </interleave>
</element>
</define>
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
index 762dc0e04a..57eaeb40ee 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
@@ -58,4 +58,11 @@ file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,\
file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,\
id=drive-scsi0-0-0-1 \
-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=1,\
-drive=drive-scsi0-0-0-1,id=scsi0-0-0-1
+drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \
+-drive file.driver=iscsi,file.portal=example.org:3260,\
+file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,\
+file.user=myname,file.password-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,\
+file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,\
+id=drive-scsi0-0-0-2 \
+-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=2,\
+drive=drive-scsi0-0-0-2,id=scsi0-0-0-2
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml b/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml
index 759d5e217f..07bb457bfa 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml
+++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml
@@ -65,6 +65,19 @@
</source>
<target dev='sdb' bus='scsi'/>
</disk>
+ <disk type='network' device='lun'>
+ <driver name='qemu' type='raw'/>
+ <source protocol='iscsi' name='iqn.1992-01.com.example:server/0'>
+ <host name='example.org' port='3260'/>
+ <initiator>
+ <iqn name='iqn.1992-01.com.example:client'/>
+ </initiator>
+ <auth username='myname'>
+ <secret type='iscsi' usage='mycluster_myname'/>
+ </auth>
+ </source>
+ <target dev='sdc' bus='scsi'/>
+ </disk>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<controller type='scsi' index='0' model='virtio-scsi'/>
--
2.24.1
4 years, 10 months
[libvirt] [jenkins-ci PATCH v2] guests: add more detailed docs on deploying FreeBSD
by Daniel P. Berrangé
Provide instructions on how to download & deploy a working FreeBSD
install that's suitable for CI, as there are several gotchas not
mentioned in the current docs.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
guests/README.markdown | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/guests/README.markdown b/guests/README.markdown
index 7e63540..d450b4a 100644
--- a/guests/README.markdown
+++ b/guests/README.markdown
@@ -137,6 +137,37 @@ FreeBSD
Installation of FreeBSD guests must be performed manually; alternatively,
the official qcow2 images can be used to quickly bring up such guests.
+ $ MAJOR=12
+ $ MINOR=1
+ $ VER=$MAJOR.$MINOR-RELEASE
+ $ sudo wget -O /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2.xz \
+ https://download.freebsd.org/ftp/releases/VM-IMAGES/$VER/amd64/Latest/Fre...
+ $ sudo unxz /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2.xz
+ $ sudo virt-install \
+ --import \
+ --name libvirt-freebsd-$MAJOR \
+ --vcpus 2 \
+ --graphics vnc \
+ --noautoconsole \
+ --console pty \
+ --sound none \
+ --rng device=/dev/urandom,model=virtio \
+ --memory 2048 \
+ --os-variant freebsd$MAJOR.0 \
+ --disk /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2
+
+The default qcow2 images are sized too small to be usable. To enlarge
+them do
+
+ $ sudo virsh blockresize libvirt-freebsd-$MAJOR \
+ /var/lib/libvirt/images/libvirt-freebsd-$MAJOR.qcow2 20G
+
+Then inside the guest, as root, enlarge the 3rd partition & filesystem
+to consume all new space:
+
+ # gpart resize -i 3 vtbd0
+ # service growfs onestart
+
Some manual tweaking will be needed, in particular:
* `/etc/ssh/sshd_config` must contain the `PermitRootLogin yes` directive;
--
2.23.0
4 years, 10 months