- Devel - libvirt List Archives

[libvirt] [PATCH 00/15] NEWS: Plenty of fixes and improvements
by Andrea Bolognani 15 Oct '15

15 Oct '15

Oh boy, where to start :) Patch 01 fixes the XSLT stylesheet used to generate the plain text NEWS file from docs/news.html.in. This has been broken for at least two years, based on the oldest release archive available on the website. Patches 02-05 clean up some very simple mistakes. Patches 06-09 are the juicy bits: very old entries were not as tidy as recent ones, so I went through them and polished them up to bring them up to standard. It would be great if someone who was around from the early days, ideally DV, could go over patch 09 in particular, since categorizing old changes I know barely nothing about is by definition prone to error. Patches 10-15 go over everything one last time for that extra shiny finish. Cheers. PS: Patch 07 contains an awfully long line that git-send-email warns me about. I'll try to sent it anyway, but if it doesn't make it to the list that's probably the reason. Andrea Bolognani (15): NEWS: Fix XSLT stylesheet NEWS: Include description for release 0.7.3 NEWS: Remove empty sections NEWS: Split off merged sections NEWS: Properly escape > in HTML NEWS: Split old entries (2009) NEWS: Split old entries (2008) NEWS: Split old entries (2006-2007) NEWS: Organize old entries NEWS: Fix whitespace NEWS: Fix newlines NEWS: Fix indentation NEWS: Add empty lines NEWS: Unify section titles NEWS: Unify date format docs/news.html.in | 6071 ++++++++++++++++++++++++++++++----------------------- docs/news.xsl | 27 +- 2 files changed, 3483 insertions(+), 2615 deletions(-) -- 2.4.3

3 36

[libvirt] cpu affinity, isolcpus and cgroups
by Henning Schild 14 Oct '15

14 Oct '15

Hi, i am currently looking into realtime VMs using libvirt. My first starting point was reserving a couple of cores using isolcpus and later tuning the affinity to place my vcpus on the reserved pcpus. My first observation was that libvirt ignores isolcpus. Affinity masks of new qemus will default to all cpus and will not be inherited from libvirtd. A comment in the code suggests that this is done on purpose. After that i changed the code to use only the available cpus by default. But taskset was still showing all 'f's on my qemus. Then i traced my change down to sched_setaffinity assuming that some other mechanism might have reverted my hack, but it is still in place. Libvirt is setting up cgroups and now my suspicion is that cgroups and taskset might not work well together. > /sys/fs/cgroup/cpu/machine.slice/machine-qemu\x2dvm1.scope/vcpu0# > cpuacct.usage_percpu > 247340587 50851635 89631114 23383025 412639264 1241965 55442753 19923 > 14093629 15863859 27403280 1292195745 82031088 53690508 135826421 > 124915000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 Looks like the last 16 cores are not used. But if i use taskset to ask for the affinity mask i get all 32 cpus. > taskset -p `cat tasks` > pid 12905's current affinity mask: ffffffff I know that is not strictly libvirt but also a kernel question, still you guys are probably able to point me to what i am missing here. > Linux 3.18.11+ #4 SMP PREEMPT RT regards, Henning

2 4

[libvirt] [PATCH RFC 0/7] libxl: domain statistics support
by Joao Martins 14 Oct '15

14 Oct '15

Hey Jim, This series bring support for various statistics about domains regarding CPU, Memory, Network Interfaces and BlockStats. Not all of the statistics are implemented: qdisk support is missing in this series and some of the memory statistics aren't available. With this series we further implement 7 more functions of libvirt APIs. It is organized as follows: * Patch 1, 2: implements cpu/memory statistics. * Patch 3, 4: implements (netback) network statistics and VBD block statistics. QDisk will follow up in a separate series regarding QEMU monitor integration. * Patch 5: implement fetching all domain statistics * Patch 6, 7: implements Job information. Overall it looks big but 70% of the patch is due to #4 and #5 but doesn't add necessarily more complexity to the driver I believe. Patch #6 and #7 are of special importance because GetJobInfo and GetJobStats are now used in Openstack Kilo to monitor live-migration progress. This two patches together with an earlier series [0] I sent before let us sucessfully live-migrate with Openstack Kilo. Further with this series we get to support nova diagnostics. Tested this series on 4.4.3 and 4.5 setups plus Openstack Kilo. Any comments or suggestions are welcome, Thanks! Joao Joao Martins (7): libxl: implement virDomainGetCPUStats libxl: implement virDomainMemorystats libxl: implement virDomainInterfaceStats libxl: implement virDomainBlockStats libxl: implement virConnectGetAllDomainStats libxl: implement virDomainGetJobInfo libxl: implement virDomainGetJobStats configure.ac | 2 +- src/libxl/libxl_domain.c | 29 ++ src/libxl/libxl_domain.h | 6 + src/libxl/libxl_driver.c | 1010 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1046 insertions(+), 1 deletion(-) -- 2.1.4

3 27

[libvirt] libvirt-php and xpath function from libxml2
by Vasiliy Tolstov 14 Oct '15

14 Oct '15

Hi! I'm test under high load some libvirt-php xpath based function and big memory leak under each function call. I'm try to patch libvirt-php to free some values via xmlFree , but this is not solve leaks. Do we realy need this function? As i see when i'm use plain libvirt function and use returned xml with internal php functions that works with xml and xpath, i'm not get memory leaks. So does we really need it? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 3

[libvirt] [PATCH] build: get further on cygwin 'make check'
by Eric Blake 14 Oct '15

14 Oct '15

Based on how we generate protocol-structs files for checking that our protocol changes are backwards-compatible, we end up compiling lxc and lockd protocol files on all platforms during 'make check', even though we may never link those files into a final library or executable. For this to work on cygwin, the CFLAGS addition of $(XDR_CFLAGS) must be unconditional. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'll wait for review rather than invoking build-breaker rule, as 'make check' is a bit stronger than 'make'. src/Makefile.am | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 99b4993..e2c3e47 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1305,6 +1305,19 @@ EXTRA_DIST += qemu/qemu.conf qemu/libvirtd_qemu.aug \ qemu/test_libvirtd_qemu.aug.in qemu/THREADS.txt +libvirt_driver_lxc_impl_la_CFLAGS = \ + $(LIBNL_CFLAGS) \ + $(FUSE_CFLAGS) \ + $(XDR_CFLAGS) \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) +libvirt_driver_lxc_impl_la_LIBADD = \ + $(CAPNG_LIBS) \ + $(LIBNL_LIBS) \ + $(LIBXML_LIBS) \ + $(FUSE_LIBS) + if WITH_LXC noinst_LTLIBRARIES += libvirt_driver_lxc_impl.la libvirt_driver_lxc_la_SOURCES = @@ -1319,19 +1332,6 @@ noinst_LTLIBRARIES += libvirt_driver_lxc.la #libvirt_la_BUILT_LIBADD += libvirt_driver_lxc.la endif ! WITH_DRIVER_MODULES -libvirt_driver_lxc_impl_la_CFLAGS = \ - $(LIBNL_CFLAGS) \ - $(FUSE_CFLAGS) \ - $(XDR_CFLAGS) \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) -libvirt_driver_lxc_impl_la_LIBADD = \ - $(CAPNG_LIBS) \ - $(LIBNL_LIBS) \ - $(LIBXML_LIBS) \ - $(FUSE_LIBS) - if WITH_BLKID libvirt_driver_lxc_impl_la_CFLAGS += $(BLKID_CFLAGS) libvirt_driver_lxc_impl_la_LIBADD += $(BLKID_LIBS) @@ -2307,15 +2307,16 @@ endif WITH_LXC lockdriverdir = $(libdir)/libvirt/lock-driver lockdriver_LTLIBRARIES = +lockd_la_CFLAGS = -I$(srcdir)/conf \ + $(XDR_CFLAGS) \ + $(AM_CFLAGS) + if WITH_LIBVIRTD lockdriver_LTLIBRARIES += lockd.la lockd_la_SOURCES = \ $(LOCK_DRIVER_LOCKD_SOURCES) \ $(LOCK_PROTOCOL_GENERATED) \ $(NULL) -lockd_la_CFLAGS = -I$(srcdir)/conf \ - $(XDR_CFLAGS) \ - $(AM_CFLAGS) lockd_la_LDFLAGS = -module -avoid-version lockd_la_LIBADD = ../gnulib/lib/libgnu.la \ libvirt-net-rpc.la \ -- 2.4.3

2 1

[libvirt] [PATCH] build: include xdr cflags for libvirt-admin
by Eric Blake 14 Oct '15

14 Oct '15

Without this, building on cygwin fails with: CC libvirt_admin_la-libvirt-admin.lo libvirt-admin.c:25:21: fatal error: rpc/rpc.h: No such file or directory #include <rpc/rpc.h> ^ Reported by Yaakov Selkowitz <yselkowi(a)redhat.com> Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index d5dd9fb..99b4993 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2087,6 +2087,7 @@ libvirt_admin_la_CFLAGS = \ -I$(srcdir)/admin libvirt_admin_la_CFLAGS += \ + $(XDR_CFLAGS) \ $(CAPNG_CFLAGS) \ $(YAJL_CFLAGS) \ $(SSH2_CFLAGS) \ -- 2.4.3

1 0

[libvirt] [RFC] Automatically sync time on domain resume?
by Michal Privoznik 13 Oct '15

13 Oct '15

So I came across this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1156194 There's a request for us to automatically sync guest time on domain resume (e.g. bare virDomainResume(), or virDomainRestore() or after migration). I'd like to explore our options here and what would be acceptable upstream. I can think of two possibilities: 1) Invent new flag to all APIs in question and let mgmt applications call it. If the flag is set we would sync the guest time too. However, this masks two different operations under single API. What should be reported if resuming succeeded but syncing time did not? Success or failure? Mgmt applications will end up calling two APIs to distinguish error states anyway. 2) Do this as best effort. Unconditionally, whenever guest agent is available just issue the time sync command (possibly without waiting for reply). This, however, takes away control from users - they will no longer have possibility to just resume domain without time sync. There's of course the obvious solution - not change anything and have mgmt apps calling two separate APIs - like they oughtta be doing today. What's your view? Michal

4 4

[libvirt] [PATCH 1/3] storage: add gluster backend initialization support for multiple servers
by Prasanna Kumar Kalever 13 Oct '15

13 Oct '15

This patch adds support for initialization of gluster backend with multiple servers which acts as gluster volfile servers for the gluster storage backend. This will help in achieving high availability of gluster backend connectivity via libgfapi i.e. when the first volfile server fails, then other servers specified are used as volfile server to re-establish the backend gluster connectivity. Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever(a)redhat.com> --- src/storage/storage_backend_gluster.c | 77 +++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index d2e79bc..53474c1 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -32,6 +32,9 @@ #include "virstring.h" #include "viruri.h" +#define QEMU_DEFAULT_GLUSTER_PORT 24007 +#define QEMU_DEFAULT_GLUSTER_TRANSPORT "tcp" + #define VIR_FROM_THIS VIR_FROM_STORAGE VIR_LOG_INIT("storage.storage_backend_gluster"); @@ -570,62 +573,64 @@ static int virStorageFileBackendGlusterInit(virStorageSourcePtr src) { virStorageFileBackendGlusterPrivPtr priv = NULL; - virStorageNetHostDefPtr host = &(src->hosts[0]); - const char *hostname; + const char *transport = NULL; int port = 0; + size_t i = 0; - if (src->nhosts != 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expected exactly 1 host for the gluster volume")); - return -1; - } - - hostname = host->name; - - VIR_DEBUG("initializing gluster storage file %p (gluster://%s:%s/%s%s)[%u:%u]", - src, hostname, host->port ? host->port : "0", - NULLSTR(src->volume), src->path, - (unsigned int)src->drv->uid, (unsigned int)src->drv->gid); + VIR_DEBUG("Initializing gluster volume=%s image-path=%s with uid=%u gid=%u", + NULLSTR(src->volume), src->path, + (unsigned int)src->drv->uid, (unsigned int)src->drv->gid); if (!src->volume) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing gluster volume name for path '%s'"), - src->path); + _("missing gluster volume name for path '%s'"), + src->path); return -1; } if (VIR_ALLOC(priv) < 0) return -1; - if (host->port && - virStrToLong_i(host->port, NULL, 10, &port) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse port number '%s'"), - host->port); - goto error; - } - - if (host->transport == VIR_STORAGE_NET_HOST_TRANS_UNIX) - hostname = host->socket; - if (!(priv->vol = glfs_new(src->volume))) { virReportOOMError(); goto error; } - if (glfs_set_volfile_server(priv->vol, - virStorageNetHostTransportTypeToString(host->transport), - hostname, port) < 0) { - virReportSystemError(errno, - _("failed to set gluster volfile server '%s'"), - hostname); - goto error; + for (i = 0; i < src->nhosts; i++) { + if (!src->hosts[i].port) { + port = QEMU_DEFAULT_GLUSTER_PORT; + } else if (virStrToLong_i(src->hosts[i].port, NULL, 10, &port) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to parse port number '%s'"), src->hosts[i].port); + goto error; + } + + if (src->hosts[i].transport == VIR_STORAGE_NET_HOST_TRANS_UNIX) { + transport = src->hosts[i].socket; + } else if (!src->hosts[i].transport) { + transport = QEMU_DEFAULT_GLUSTER_TRANSPORT; + } else { + transport = virStorageNetHostTransportTypeToString(src->hosts[i].transport); + } + + if (glfs_set_volfile_server(priv->vol, transport, src->hosts[i].name, + port) < 0) { + virReportSystemError(errno, + _("failed to set gluster volfile server '%s'"), + src->hosts[i].name); + goto error; + } else { + VIR_DEBUG("Successfully set volfile server with server:'%s' " + "port:'%d' transport:'%s'", src->hosts[i].name, + port, transport); + } } if (glfs_init(priv->vol) < 0) { virReportSystemError(errno, - _("failed to initialize gluster connection to " - "server: '%s'"), hostname); + _("failed to initialize gluster connection with given hosts " + "volume : '%s' image-path : '%s'"), + NULLSTR(src->volume), src->path); goto error; } -- 2.1.0

5 9

[libvirt] [RFC PATCH 0/8] Make loading domains with invalid XML possible
by Martin Kletzander 13 Oct '15

13 Oct '15

We always had to deal with new parsing errors in a weird way. All of them needed to go into functions starting the domains. That messes up the code, it's confusing to newcomers and so on. I once had an idea that we can handle this stuff. We know what failed, we have the XML that failed parsing and if the problem is not in the domain name nor UUID, we can create a domain object out of that as well. This way we are able to do something we weren't with this series applied. Example follows. Assume "dummy" is a domain with invalid XML (I just modified the file). Now, just for the purpose of this silly example, let's say we allowed domains with archtecture x86_*, but now we've realized that x86_64 is the only one we want to allow, but there already is a domain defined that has <type arch='x86_256' .../>. With the current master, the domain would be lost, so we would need to modify the funstion starting the domain (e.g. qemuProcessStart for qemu domain). However, with this series, it behaves like this: # virsh list --all Id Name State ---------------------------------------------------- - dummy shut off # virsh domstate --reason dummy shut off (invalid XML) # virsh start dummy error: Failed to start domain dummy error: XML error: domain 'dummy' was not loaded due to an XML error (unsupported configuration: Unknown architecture x86_256), please redefine it # VISUAL='sed -i s/x86_256/x86_64/' virsh edit dummy Domain dummy XML configuration edited. # virsh domstate --reason dummy shut off (unknown) # virsh start dummy Domain dummy started This is a logical next step for us to clean and separate parsing and starting, getting rid of some old code without sacrifying compatibility and maybe generating parser code in the future. Why is this an RFC? - I can certainly easily imagine some people who might not like this - It doesn't work for all drivers (yet) - It does handle status XMLs, but only slightly. All the handling is done in a commit message that says something along the lines of "beware, we should still be careful, but not as much as before". - The error type used for the message is one that is already used for something else and we might want a new type of error for exactly this one error message, although it might be enough for some to have the possibility of checking this by querying the domain state and checking the reason. - Just so you know I came up with something new for which there's no BZ (or at least yet) =) Martin Kletzander (8): conf, virsh: Add new domain shutoff reason qemu: Few whitespace cleanups conf: Extract name-parsing into its own function conf: Extract UUID parsing into its own function conf: Optionally keep domains with invalid XML qemu: Don't lookup invalid domains unless specified otherwise qemu: Prepare basic APIs to handle invalid defs qemu: Load domains with invalid XML on start include/libvirt/libvirt-domain.h | 2 + src/bhyve/bhyve_driver.c | 2 + src/conf/domain_conf.c | 180 +++++++++++++++++++++++++++++++++------ src/conf/domain_conf.h | 5 ++ src/libxl/libxl_driver.c | 3 + src/lxc/lxc_driver.c | 3 + src/qemu/qemu_driver.c | 64 +++++++++++--- src/uml/uml_driver.c | 2 + tools/virsh-domain-monitor.c | 3 +- 9 files changed, 223 insertions(+), 41 deletions(-) -- 2.5.3

4 24

[libvirt] [PATCH] libvirt-domain: Drop virDomainMigrateCheckNotLocal attribute
by Michal Privoznik 13 Oct '15

13 Oct '15

Our apibuild.py script does not cope with ATTRIBUTE_NONNULL: Parse Error: parsing function type, ')' expected Got token ('name', 'char') Last token: ('name', 'char') Token queue: [('op', '*'), ('name', 'dconnuri'), ('sep', ')')] Line 3297 end: Makefile:2441: recipe for target '../../docs/apibuild.py.stamp' failed Let's drop it. Moreover, up until e17ae3ccc2dbc1400 where it was introduced we did not really care about NULL-ity of dconnuri. And moreover the ATTRIBUTE_NONNULL merely checks for static calls over NULL, it won't catch the dynamic ones, where a NULL is passed by a variable at runtime. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index e6c8604..6e1aacd 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3293,7 +3293,7 @@ virDomainMigrateVersion3Params(virDomainPtr domain, } -static int ATTRIBUTE_NONNULL(1) +static int virDomainMigrateCheckNotLocal(const char *dconnuri) { virURIPtr tempuri = NULL; -- 2.4.9

4 4

[libvirt] virsh can't support VM offline blockcommit
by 陈明 13 Oct '15

13 Oct '15

Hi everyone! I use the libvirt(version: 1.2.2) and QEMU(version: 2.2.1) to test qemu snapshot features: I tried virsh blockcommit when VM offline, the virsh blockcommit failed: the error messase as below: * error: Requested operation is not valid: domain is not running* when I start the VM, the virsh blockcommit work fine! my question is : we need virsh support blockcommit when VM offline。how do？ we test qemu snapshot as follows： we need create snapshot of the cycle，and by virsh blockcommit merge snapshot chain，but whenVM offline， the virsh blockcommit will fail， someone suggest me：when VM offline，may use qemu-img commit to submit snapshot turn，but qemu-img can't modify snapshot chain backing relation，it need we use qemu-img rebase amend snapshot‘s backingfile，* the main question* is when we use qemu-img rebase modify snapshot's backingfile, if someone start the VM, it will may lead to VM filesystem readonly。 we should how to solve the question? thanks!

1 0

[libvirt] [PATCH v2] virt-host-validate: check for IOMMU support
by Daniel P. Berrange 13 Oct '15

13 Oct '15

This looks for existance of DMAR (Intel) and IVRS (AMD) files under /sys/firmware/acpi/tables/, as a sign that the platform has IOMMU present & enabled in the BIOS. If these are present and /sys/kernel/iommu_groups does not contain any entries this is taken as a sign that the kernel has not enabled the IOMMU currently. If no ACPI tables are found we can't distinguish between disabled in BIOS and not present in the hardware, so we have to give the user a generic hint. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Changed in v2: - Completely refactor the check to remove false positives and cope with iommu being enabled by default - Add AMD support tools/virt-host-validate-common.c | 64 +++++++++++++++++++++++++++++++++++++++ tools/virt-host-validate-common.h | 3 ++ tools/virt-host-validate-qemu.c | 6 ++++ 3 files changed, 73 insertions(+) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index a88fc56..38128b1 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <unistd.h> #include <sys/utsname.h> +#include <sys/stat.h> #include <mntent.h> #include "virutil.h" @@ -341,3 +342,66 @@ int virHostValidateCGroupController(const char *hvname, return -1; return 0; } + +int virHostValidateIOMMU(const char *hvname, + virHostValidateLevel level) +{ + struct stat sb; + const char *bootarg = NULL; + bool isAMD = false, isIntel = false; + + if (virHostValidateHasCPUFlag("vmx")) + isIntel = true; + else if (virHostValidateHasCPUFlag("svm")) + isAMD = true; + else + /* XXX PPC/ARM/etc support */ + return 0; + + virHostMsgCheck(hvname, "%s", _("for device assignment IOMMU support")); + + if (isIntel) { + if (access("/sys/firmware/acpi/tables/DMAR", F_OK) == 0) { + virHostMsgPass(); + bootarg = "intel_iommu=on"; + } else { + virHostMsgFail(level, + "No ACPI DMAR table found, IOMMU either " + "disabled in BIOS or not supported by this " + "hardware platform"); + return -1; + } + } else if (isAMD) { + if (access("/sys/firmware/acpi/tables/IVRS", F_OK) == 0) { + virHostMsgPass(); + bootarg = "iommu=pt iommu=1"; + } else { + virHostMsgFail(level, + "No ACPI IVRS table found, IOMMU either " + "disabled in BIOS or not supported by this " + "hardware platform"); + return -1; + } + } else { + virHostMsgFail(level, + "Unknown if this platform has IOMMU support"); + return -1; + } + + + /* We can only check on newer kernels with iommu groups & vfio */ + if (stat("/sys/kernel/iommu_groups", &sb) < 0) + return 0; + + if (!S_ISDIR(sb.st_mode)) + return 0; + + virHostMsgCheck(hvname, "%s", _("if IOMMU is enabled by kernel")); + if (sb.st_nlink <= 2) { + virHostMsgFail(level, + "IOMMU appears to be disabled in kernel. " + "Add %s to kernel cmdline arguments", bootarg); + return -1; + } + return 0; +} diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h index 1547e22..d4c4759 100644 --- a/tools/virt-host-validate-common.h +++ b/tools/virt-host-validate-common.h @@ -70,4 +70,7 @@ extern int virHostValidateCGroupController(const char *hvname, virHostValidateLevel level, const char *config_name); +extern int virHostValidateIOMMU(const char *hvname, + virHostValidateLevel level); + #endif /* __VIRT_HOST_VALIDATE_COMMON_H__ */ diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c index b0ae293..044df65 100644 --- a/tools/virt-host-validate-qemu.c +++ b/tools/virt-host-validate-qemu.c @@ -20,6 +20,8 @@ */ #include <config.h> +#include <unistd.h> + #include "virt-host-validate-qemu.h" #include "virt-host-validate-common.h" @@ -87,5 +89,9 @@ int virHostValidateQEMU(void) "BLK_CGROUP") < 0) ret = -1; + if (virHostValidateIOMMU("QEMU", + VIR_HOST_VALIDATE_WARN) < 0) + ret = -1; + return ret; } -- 2.4.3

1 1

[libvirt] [PATCH] virt-host-validate: disable mntent code on Win32
by Daniel P. Berrange 13 Oct '15

13 Oct '15

Win32 does not have support for mntent.h header, so the method which uses this must be stubbed out. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix for Mingw tools/virt-host-validate-common.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index a88fc56..dd41fd4 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -26,7 +26,9 @@ #include <stdio.h> #include <unistd.h> #include <sys/utsname.h> -#include <mntent.h> +#ifdef HAVE_MNTENT_H +# include <mntent.h> +#endif /* HAVE_MNTENT_H */ #include "virutil.h" #include "viralloc.h" @@ -287,6 +289,7 @@ static int virHostValidateCGroupSupport(const char *hvname, return -1; } +#ifdef HAVE_MNTENT_H static int virHostValidateCGroupMount(const char *hvname, const char *cg_name, virHostValidateLevel level) @@ -324,6 +327,16 @@ static int virHostValidateCGroupMount(const char *hvname, cg_name, cg_name); return -1; } +#else /* ! HAVE_MNTENT_H */ +static int virHostValidateCGroupMount(const char *hvname, + const char *cg_name, + virHostValidateLevel level) +{ + virHostMsgCheck(hvname, "for cgroup '%s' controller mount-point", cg_name); + virHostMsgFail(level, "%s", "This platform does not support cgroups"); + return -1; +} +#endif /* ! HAVE_MNTENT_H */ int virHostValidateCGroupController(const char *hvname, const char *cg_name, -- 2.4.3

2 1

[libvirt] [PATCH v2] storage: Fix incorrect format for <disk> <auth> XML
by John Ferlan 12 Oct '15

12 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1256999 After creating a copy of the 'authdef' in a pool -> disk translation, unconditionally clear the 'authType' in the resulting disk auth def structure since that's used for a storage pool and not a disk. This ensures virStorageAuthDefFormat will properly format the <auth> XML for a <disk> (e.g. it won't have a <auth type='%s'.../>). Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index ddf4405..0a7ebcc 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -3199,6 +3199,8 @@ virStorageTranslateDiskSourcePoolAuth(virDomainDiskDefPtr def, def->src->auth = virStorageAuthDefCopy(source->auth); if (!def->src->auth) goto cleanup; + /* A <disk> doesn't use <auth type='%s', so clear that out for the disk */ + def->src->auth->authType = VIR_STORAGE_AUTH_TYPE_NONE; ret = 0; cleanup: -- 2.1.0

2 1

[libvirt] [PATCH v4 0/12] migration: support all toURI and proto combos
by Nikolay Shirokovskiy 12 Oct '15

12 Oct '15

Current implementation of 'toURI' migration interfaces does not support all combinations of interface versions and protocol versions. For example 'toURI2' with p2p flag will not migrate if driver supports only v3params proto. This is not convinient as drivers that starts to support migration have to manually support older versions of protocol. I guess this should be done in one place, namely here. Another issue is that there are a lot of code duplication in implementation of toURI interfaces and it is not obvious from code how are they related. This implementation uses extensible parameters as intermediate parameters representation. This is possible as interfaces are done backward compatible in terms of parameters and later versions supports all parameters of former versions. = Changes from version 3 * fix spellings * make error messages more specific as suggested * in 'migration: refactor: introduce params version of unmanaged': fix conversion for null values of explicit string params into virTypedParameterPtr. * squash 'migration: reuse parameters check in toURI2 and toURI3' into 'migration: introduce parameter checking function' * 'migration: refactor: one return in forURI family functions' is dropped as suggested src/libvirt-domain.c | 509 +++++++++++++++++++++++--------------------------- 1 files changed, 237 insertions(+), 272 deletions(-)

2 18

[libvirt] [PATCH 0/4] Add more host validation checks
by Daniel P. Berrange 12 Oct '15

12 Oct '15

This extends the virt-host-validate command todo a bunch more checks. Probably the most interesting is the last one which checks for Intel IOMMU needed todo PCI assignment with KVM. It is pretty crude, so further suggestions welcome. I don't want to grep dmesg as suggested in [1] since dmesg can be purged by the time we look at it. What kmods should we look for for VT-D too ? [1] http://www.linux-kvm.org/page/How_to_assign_devices_with_VT-d_in_KVM Daniel P. Berrange (4): virt-host-validate.c: check for kernel namespaces virt-host-validate: distinguish exists vs accessible for devices virt-host-validate: check for required cgroups virt-host-validate: check for intel_iommu=on cmdline flag tools/virt-host-validate-common.c | 209 +++++++++++++++++++++++++++++++++++--- tools/virt-host-validate-common.h | 31 +++++- tools/virt-host-validate-lxc.c | 60 +++++++++++ tools/virt-host-validate-qemu.c | 66 ++++++++++-- 4 files changed, 338 insertions(+), 28 deletions(-) -- 2.4.3

3 12

[libvirt] [PATCH 0/2] improve the error in 2 function
by Luyao Huang 12 Oct '15

12 Oct '15

*** BLURB HERE *** Luyao Huang (2): util: split the virNumaGetHugePageInfoPath into separate function util: Produce friendlier error message to user src/util/virnuma.c | 54 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 24 deletions(-) -- 1.8.3.1

3 10

[libvirt] virsh can't support VM offline blockcommit
by 陈明 12 Oct '15

12 Oct '15

Hi everyone! I use the libvirt(version: 1.2.2) and QEMU(version: 2.2.1) to test qemu snapshot features: I tried virsh blockcommit when VM offline, the virsh blockcommit failed: the error messase as below: * error: Requested operation is not valid: domain is not running* when I start the VM, the virsh blockcommit work fine! my question is : we need virsh support blockcommit when VM offline。how do？ we test qemu snapshot as follows： we need create snapshot of the cycle，and by virsh blockcommit merge snapshot chain，but whenVM offline， the virsh blockcommit will fail， someone suggest me：when VM offline，may use qemu-img commit to submit snapshot turn，but qemu-img can't modify snapshot chain backing relation，it need we use qemu-img rebase amend snapshot‘s backingfile，* the main question* is when we use qemu-img rebase modify snapshot's backingfile, if someone start the VM, it will may lead to VM filesystem readonly。 we should how to solve the question? thanks!

1 0

[libvirt] virsh can't support VM offline blockcommit
by justlibvirt 11 Oct '15

11 Oct '15

Hi everyone! I use the libvirt(version: 1.2.2) and QEMU(version: 2.2.1) to test qemu snapshot features: I tried virsh blockcommit when VM offline, the virsh blockcommit failed: the error messase as below: error: Requested operation is not valid: domain is not running when I start the VM, the virsh blockcommit work fine! my question is : we need virsh support blockcommit when VM offline。how do？ we test qemu snapshot as follows： we need create snapshot of the cycle，and by virsh blockcommit merge snapshot chain，but whenVM offline， the virsh blockcommit will fail， someone suggest me：when VM offline，may use qemu-img commit to submit snapshot turn，but qemu-img can't modify snapshot chain backing relation，it need we use qemu-img rebase amend snapshot‘s backingfile， the main question is when we use qemu-img rebase modify snapshot's backingfile, if someone start the VM, it will may lead to VM filesystem readonly。 we shoule solve the question? thanks!

1 0

[libvirt] [PATCH] src: Include $(builddir)/util in the header search path
by Andrea Bolognani 09 Oct '15

09 Oct '15

Since a9fe620372144db, we are generating virkeymaps.h at build time; however, we are not including $(builddir)/util in the header search path, so when doing a VPATH build the compiler is unable to locate the file. make[2]: Entering directory `/home/jenkins/libvirt/systems/libvirt-fedora-20/build/src' GEN util/virkeymaps.h ... CC util/libvirt_util_la-virkeycode.lo CC util/libvirt_util_la-virkeyfile.lo CC util/libvirt_util_la-virlockspace.lo CC util/libvirt_util_la-virlog.lo ../../src/util/virkeycode.c:27:24: fatal error: virkeymaps.h: No such file or directory #include "virkeymaps.h" ^ compilation terminated. --- Tested by * running 'git clean -xdf' in the source directory * running './autogen.sh' * running 'make distclean' * making sure src/util/virkeymaps.h did not exist * moving to an empty build directory * running '../libvirt/configure' * running 'make check' * running 'make distcheck' This is another take on the problem Michal's trying to solve with https://www.redhat.com/archives/libvir-list/2015-October/msg00254.html The commit message is "inspired" by his ;) src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index e4660eb..01e816a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,6 +31,7 @@ INCLUDES = -I../gnulib/lib \ -I../include \ -I$(top_srcdir)/include \ -I$(srcdir)/util \ + -I$(builddir)/util \ -DIN_LIBVIRT \ -Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \ -Dabs_topsrcdir="\"$(abs_topsrcdir)\"" \ -- 2.4.3

4 7

[libvirt] [PATCH] src: Remove $(builddir) usage
by Andrea Bolognani 09 Oct '15

09 Oct '15

Commit 4e8032272f1704f7 used $(builddir) in the header search path to fix a build issue; however, $(builddir) is not defined by old autoconf versions such as the one available in CentOS 5, resulting in the following error: cc1: error: /util: No such file or directory make[3]: *** [libvirt_driver_la-fdstream.lo] Error 1 Since $(builddir) is defined to always be '.', just use that value directly instead. --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 01e816a..d5dd9fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ INCLUDES = -I../gnulib/lib \ -I../include \ -I$(top_srcdir)/include \ -I$(srcdir)/util \ - -I$(builddir)/util \ + -I./util \ -DIN_LIBVIRT \ -Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \ -Dabs_topsrcdir="\"$(abs_topsrcdir)\"" \ -- 2.4.3

2 2

[libvirt] [PATCH] virJSONValueArraySize: return ssize_t
by Michal Privoznik 09 Oct '15

09 Oct '15

The internal representation of a JSON array counts the items in size_t. However, for some reason, when asking for the count it's reported as int. Firstly, we need the function to return a signed type as it's returning -1 on an error. But, not every system has integer the same size as size_t. Therefore, lets return ssize_t. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/locking/lock_daemon.c | 2 +- src/network/bridge_driver.c | 2 +- src/qemu/qemu_agent.c | 12 ++++++------ src/qemu/qemu_monitor_json.c | 28 ++++++++++++++-------------- src/rpc/virnetserver.c | 2 +- src/rpc/virnetserverservice.c | 2 +- src/util/virjson.c | 2 +- src/util/virjson.h | 2 +- src/util/virlockspace.c | 4 ++-- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index bf87af1..55fc0c3 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -184,7 +184,7 @@ virLockDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged) virJSONValuePtr lockspaces; virNetServerPtr srv; size_t i; - int n; + ssize_t n; if (VIR_ALLOC(lockd) < 0) return NULL; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c343e5b..cd9a51e 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3599,7 +3599,7 @@ networkGetDHCPLeases(virNetworkPtr network, size_t i, j; size_t nleases = 0; int rv = -1; - int size = 0; + ssize_t size = 0; int custom_lease_file_len = 0; bool need_results = !!leases; long long currtime = 0; diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 7021a7a..5735ed8 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1461,7 +1461,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, virJSONValuePtr cmd; virJSONValuePtr reply = NULL; virJSONValuePtr data = NULL; - int ndata; + ssize_t ndata; if (!(cmd = qemuAgentMakeCommand("guest-get-vcpus", NULL))) return -1; @@ -1767,7 +1767,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info, { size_t i, j, k; int ret = -1; - int ndata = 0, ndisk; + ssize_t ndata = 0, ndisk; char **alias; virJSONValuePtr cmd; virJSONValuePtr reply = NULL; @@ -1810,7 +1810,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info, if (!entry) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("array element '%zd' of '%d' missing in " + _("array element '%zd' of '%zd' missing in " "guest-get-fsinfo return data"), i, ndata); goto cleanup; @@ -1871,7 +1871,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info, if (!disk) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("array element '%zd' of '%d' missing in " + _("array element '%zd' of '%zd' missing in " "guest-get-fsinfo 'disk' data"), j, ndisk); goto cleanup; @@ -1954,7 +1954,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, { int ret = -1; size_t i, j; - int size = -1; + ssize_t size = -1; virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; virJSONValuePtr ret_array = NULL; @@ -1994,7 +1994,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, virJSONValuePtr tmp_iface = virJSONValueArrayGet(ret_array, i); virJSONValuePtr ip_addr_arr = NULL; const char *hwaddr, *ifname_s, *name = NULL; - int ip_addr_arr_size; + ssize_t ip_addr_arr_size; virDomainInterfacePtr iface = NULL; /* Shouldn't happen but doesn't hurt to check neither */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index df0c82a..b39b29b 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1265,7 +1265,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply, int ret = -1; size_t i; int *threads = NULL; - int ncpus; + ssize_t ncpus; if (!(data = virJSONValueObjectGetArray(reply, "return"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3061,7 +3061,7 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, int ret = -1; const char *tmp; virJSONValuePtr returnArray, entry, table, element; - int nTable; + ssize_t nTable; size_t i; virNetDevRxFilterPtr fil = virNetDevRxFilterNew(); @@ -4090,7 +4090,7 @@ qemuMonitorJSONGetAllBlockJobInfo(qemuMonitorPtr mon) virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; virJSONValuePtr data; - int nr_results; + ssize_t nr_results; size_t i; virHashTablePtr blockJobs = NULL; @@ -4597,7 +4597,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorMachineInfoPtr *infolist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *machines = NULL; @@ -4777,7 +4777,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **commandlist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *commands = NULL; @@ -4845,7 +4845,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **eventlist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *events = NULL; @@ -4922,7 +4922,7 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon, virJSONValuePtr data = NULL; virJSONValuePtr array = NULL; char **paramlist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *params = NULL; @@ -5093,7 +5093,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **typelist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *types = NULL; @@ -5162,7 +5162,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorJSONListPathPtr *pathlist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *paths = NULL; @@ -5408,7 +5408,7 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **proplist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *props = NULL; @@ -5527,7 +5527,7 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon, virJSONValuePtr caps; char **list = NULL; size_t i; - int n; + ssize_t n; *capabilities = NULL; @@ -5804,7 +5804,7 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **list = NULL; - int n = 0; + ssize_t n = 0; size_t i; *array = NULL; @@ -6167,7 +6167,7 @@ qemuMonitorJSONGetCPUx86Data(qemuMonitorPtr mon, virCPUx86Data *x86Data = NULL; virCPUx86CPUID cpuid; size_t i; - int n; + ssize_t n; int ret = -1; /* look up if the property exists before asking */ @@ -6330,7 +6330,7 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorIOThreadInfoPtr *infolist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *iothreads = NULL; diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 80b5588..547e52e 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -369,7 +369,7 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, virJSONValuePtr clients; virJSONValuePtr services; size_t i; - int n; + ssize_t n; unsigned int min_workers; unsigned int max_workers; unsigned int priority_workers; diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 3b35fc0..1ef0636 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -328,7 +328,7 @@ virNetServerServicePtr virNetServerServiceNewPostExecRestart(virJSONValuePtr obj virNetServerServicePtr svc; virJSONValuePtr socks; size_t i; - int n; + ssize_t n; unsigned int max; if (virNetServerServiceInitialize() < 0) diff --git a/src/util/virjson.c b/src/util/virjson.c index c123943..ae6362b 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -864,7 +864,7 @@ virJSONValueIsArray(virJSONValuePtr array) } -int +ssize_t virJSONValueArraySize(const virJSONValue *array) { if (array->type != VIR_JSON_TYPE_ARRAY) diff --git a/src/util/virjson.h b/src/util/virjson.h index a7df6e5..66ed48a 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -114,7 +114,7 @@ virJSONValuePtr virJSONValueObjectGetByType(virJSONValuePtr object, const char *key, virJSONType type); bool virJSONValueIsArray(virJSONValuePtr array); -int virJSONValueArraySize(const virJSONValue *array); +ssize_t virJSONValueArraySize(const virJSONValue *array); virJSONValuePtr virJSONValueArrayGet(virJSONValuePtr object, unsigned int element); virJSONValuePtr virJSONValueArraySteal(virJSONValuePtr object, unsigned int element); diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 2366a74..7aa0f1d 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -293,7 +293,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) { virLockSpacePtr lockspace; virJSONValuePtr resources; - int n; + ssize_t n; size_t i; VIR_DEBUG("object=%p", object); @@ -336,7 +336,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) const char *tmp; virJSONValuePtr owners; size_t j; - int m; + ssize_t m; if (VIR_ALLOC(res) < 0) goto error; -- 2.4.9

2 1

[libvirt] Cannot dump core: error: Requested operation is not valid: domain is marked for auto destroy
by Richard W.M. Jones 09 Oct '15

09 Oct '15

I wonder if there's a reason why it is not possible to dump the core of a KVM domain which is set to autodestroy. $ virsh dump guestfs-4xe592eyqq4rfnk9 /tmp/guestfs-4xe592eyqq4rfnk9.core error: Failed to core dump domain guestfs-4xe592eyqq4rfnk9 to /tmp/guestfs-4xe592eyqq4rfnk9.core error: Requested operation is not valid: domain is marked for auto destroy All libguestfs domains have the autodestroy flag, but I am trying to debug one which is crashing in the guest (RHBZ#1269779) and having the ability to dump it would be very helpful. I added the following patch to libvirt, which allowed me to dump the domain with no apparent ill effects. (The patch is a bit of a hack, and I did not check it very closely, so it's probably not suitable for going upstream). Rich. >From ffb899e436c15974b0f42b1cbd8337701c3a05d1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" <rjones(a)redhat.com> Date: Thu, 8 Oct 2015 11:11:10 +0100 Subject: [PATCH] qemu: Don't prevent core dump of auto-destroy domain. --- src/qemu/qemu_driver.c | 8 ++++---- src/qemu/qemu_migration.c | 16 +++++++++------- src/qemu/qemu_migration.h | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8cd5ee3..c3778de 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3184,7 +3184,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom, if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationIsAllowed(driver, vm, false, false, 0)) goto cleanup; if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_SAVE) < 0) @@ -3616,7 +3616,7 @@ doCoreDump(virQEMUDriverPtr driver, goto cleanup; } - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationIsAllowed(driver, vm, false, true, 0)) goto cleanup; ret = qemuMigrationToFile(driver, vm, fd, 0, path, @@ -13690,7 +13690,7 @@ qemuDomainSnapshotCreateActiveInternal(virConnectPtr conn, bool resume = false; int ret = -1; - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationIsAllowed(driver, vm, false, false, 0)) goto cleanup; if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { @@ -14505,7 +14505,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, /* do the memory snapshot if necessary */ if (memory) { /* check if migration is possible */ - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationIsAllowed(driver, vm, false, false, 0)) goto cleanup; /* allow the migration job to be cancelled or the domain to be paused */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d0f1e46..19031f9 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2201,7 +2201,7 @@ qemuMigrationIsAllowedHostdev(const virDomainDef *def) bool qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, - bool remote, + bool remote, bool coreDump, unsigned int flags) { int nsnapshots; @@ -2235,10 +2235,12 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, /* following checks don't make sense for offline migration */ if (!(flags & VIR_MIGRATE_OFFLINE)) { - if (qemuProcessAutoDestroyActive(driver, vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is marked for auto destroy")); - return false; + if (!coreDump) { + if (qemuProcessAutoDestroyActive(driver, vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is marked for auto destroy")); + return false; + } } @@ -2987,7 +2989,7 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver, if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT) qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_BEGIN3); - if (!qemuMigrationIsAllowed(driver, vm, true, flags)) + if (!qemuMigrationIsAllowed(driver, vm, true, false, flags)) goto cleanup; if (!(flags & VIR_MIGRATE_UNSAFE) && @@ -5347,7 +5349,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, goto endjob; } - if (!qemuMigrationIsAllowed(driver, vm, true, flags)) + if (!qemuMigrationIsAllowed(driver, vm, true, false, flags)) goto endjob; if (!(flags & VIR_MIGRATE_UNSAFE) && diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 8175f4b..cc4d25d 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -174,7 +174,7 @@ int qemuMigrationConfirm(virConnectPtr conn, int cancelled); bool qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, - bool remote, unsigned int flags); + bool remote, bool coreDump, unsigned int flags); int qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, int fd, off_t offset, const char *path, -- 2.5.3 -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v

3 4

[libvirt] [libvirt-test-API] [PATCH] fix some typo
by Shanzhi Yu 09 Oct '15

09 Oct '15

Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- repos/domain/fsinfo.py | 2 +- repos/domain/install_linux_check.py | 2 +- repos/domain/install_linux_net.py | 2 +- repos/interface/define.py | 2 +- repos/interface/undefine.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/repos/domain/fsinfo.py b/repos/domain/fsinfo.py index e6d1bf0..d4614f5 100644 --- a/repos/domain/fsinfo.py +++ b/repos/domain/fsinfo.py @@ -81,7 +81,7 @@ def fsinfo(params): return 1 fsinfo = vm.fsInfo() - logger.info("get geust filesystem information") + logger.info("get guest filesystem information") mac = get_guest_mac(vm) if not mac: diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py index ab1e7db..bb3cc2a 100644 --- a/repos/domain/install_linux_check.py +++ b/repos/domain/install_linux_check.py @@ -99,7 +99,7 @@ def install_linux_check(params): Test_Result = 1 return Test_Result - # Check whether vcpu equals the value set in geust config xml + # Check whether vcpu equals the value set in guest config xml logger.info("check point3: check cpu number in guest equals to \ the value set in domain config xml") vcpunum_expect = int(utils.get_num_vcpus(domain_name)) diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py index 4367d97..7173294 100644 --- a/repos/domain/install_linux_net.py +++ b/repos/domain/install_linux_net.py @@ -239,7 +239,7 @@ def install_linux_net(params): logger.info("booting guest vm off harddisk failed") return 1 else: - logger.info("geust is booting up") + logger.info("guest is booting up") else: interval = 0 while(interval < 3600): diff --git a/repos/interface/define.py b/repos/interface/define.py index 18ba71b..e0dbcf4 100644 --- a/repos/interface/define.py +++ b/repos/interface/define.py @@ -42,7 +42,7 @@ def define(params): try: conn.interfaceDefineXML(xmlstr, 0) if check_define_interface(ifacename): - logger.info("define a interface form xml is successful") + logger.info("define a interface from xml is successful") else: logger.error("fail to check define interface") return 1 diff --git a/repos/interface/undefine.py b/repos/interface/undefine.py index f9b2d74..8b250de 100644 --- a/repos/interface/undefine.py +++ b/repos/interface/undefine.py @@ -39,14 +39,14 @@ def undefine(params): try: ifaceobj.undefine() if check_undefine_interface(ifacename): - logger.info("undefine a interface form xml is successful") + logger.info("undefine a interface is successful") else: logger.error("fail to check undefine interface") return 1 except libvirtError, e: logger.error("API error message: %s, error code is %s" \ % (e.message, e.get_error_code())) - logger.error("fail to undefine a interface from xml") + logger.error("fail to undefine a interface") return 1 return 0 -- 1.8.3.1

2 1

[libvirt] [libvirt-test-API] [PATCH] fix two error in script pin_iothread.py and connection_getAllDomainStats.py
by Shanzhi Yu 09 Oct '15

09 Oct '15

Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- repos/domain/pin_iothread.py | 2 +- repos/virconn/connection_getAllDomainStats.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repos/domain/pin_iothread.py b/repos/domain/pin_iothread.py index 28ee2c4..d2d812f 100644 --- a/repos/domain/pin_iothread.py +++ b/repos/domain/pin_iothread.py @@ -116,7 +116,7 @@ def pin_iothread(params): if not find_iothreadid_fromxml(vm, 1, 1): logger.info("add iothread %d to running guest" % 1) - vm.addIOThread(i, libvirt.VIR_DOMAIN_AFFECT_LIVE) + vm.addIOThread(1, libvirt.VIR_DOMAIN_AFFECT_LIVE) vm.pinIOThread(1, tu_cpu, libvirt.VIR_DOMAIN_AFFECT_LIVE) cpuset = find_iothreadpin_fromxml(vm, 1, 1) diff --git a/repos/virconn/connection_getAllDomainStats.py b/repos/virconn/connection_getAllDomainStats.py index d95004f..3362444 100644 --- a/repos/virconn/connection_getAllDomainStats.py +++ b/repos/virconn/connection_getAllDomainStats.py @@ -164,7 +164,7 @@ def check_each_vcpu(logger,dom_name,dom_active,dom_eles): if not vcpu_cur: for i in range(0,vcpu_max): vcpu_pre = "vcpu."+ str(i) + "." - logger.debug("Checking %sstate: %d" \ + logger.debug("Checking %sstate: %s" \ %(vcpu_pre, dom_eles.get(vcpu_pre + "state"))) if not compare_value(logger,vcpu_stat, \ dom_eles.get(vcpu_pre + "state")): @@ -172,7 +172,7 @@ def check_each_vcpu(logger,dom_name,dom_active,dom_eles): elif int(vcpu_cur.nodeValue) <= vcpu_max: for i in range(0,int(vcpu_cur.nodeValue)): vcpu_pre = "vcpu."+ str(i) + "." - logger.debug("Checking %sstate: %d" \ + logger.debug("Checking %sstate: %s" \ %(vcpu_pre, dom_eles.get(vcpu_pre + "state"))) if not compare_value(logger,vcpu_stat, \ dom_eles.get(vcpu_pre + "state")): -- 1.8.3.1

2 1

[libvirt] [libvirt-test-API] [PATCH] Add two cases for API interfaceAddresses and make small changes to global.cfg
by Shanzhi Yu 09 Oct '15

09 Oct '15

Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- cases/linux_domain.conf | 12 +++++++ global.cfg | 8 +++-- repos/domain/get_guest_network_info.py | 66 ++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 repos/domain/get_guest_network_info.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index 8440c61..5b216f9 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -66,6 +66,18 @@ domain:set_guest_time flags sync +domain:get_guest_network_info + guestname + $defaultname + flags + lease + +domain:get_guest_network_info + guestname + $defaultname + flags + agent + virconn:connection_getAllDomainStats stats state|cpu|balloon|vcpu|interface|block diff --git a/global.cfg b/global.cfg index 56677a5..1b72119 100644 --- a/global.cfg +++ b/global.cfg @@ -44,6 +44,8 @@ rhel6u1_i386 = http:// rhel6u1_x86_64 = http:// rhel6u2_i386 = http:// rhel6u2_x86_64 = http:// +rhel7u1_x86_64 = http:// +rhel7u2_x86_64 = http:// fedora12_i386 = http:// fedora12_x86_64 = http:// win2008_i386 = http:// @@ -70,6 +72,8 @@ rhel6_i386_http_ks = http:// rhel6_x86_64_http_ks = http:// rhel6u2_i386_http_ks = http:// rhel6u2_x86_64_http_ks = kickstart.cfg +rhel7u1_x86_64_http_ks = http:// +rhel7u2_x86_64_http_ks = http:// fedora12_i386_http_ks = http:// fedora12_x86_64_http_ks = http:// @@ -97,7 +101,7 @@ sourcepath = /media/share # also exercise DNS resolution # [other] -wget_url = http:// +wget_url = http://libvirt.org/index.html # # The variables section is a set of variables used by the @@ -127,7 +131,7 @@ defaulthv = kvm defaultname = libvirt_test_api # default os version to use for installing a new guest # the value of it is the first part of 'rhel6u2_x86_64' in [guest] section above -defaultos = rhel6u2 +defaultos = rhel7u2 # default architecture to use for installing a new guest defaultarch = x86_64 # default the number of vcpu to use for defining or installing a guest diff --git a/repos/domain/get_guest_network_info.py b/repos/domain/get_guest_network_info.py new file mode 100644 index 0000000..35bba3b --- /dev/null +++ b/repos/domain/get_guest_network_info.py @@ -0,0 +1,66 @@ +#!/usr/bin/python + +import libvirt +from libvirt import libvirtError +from src import sharedmod + +required_params = ('guestname', 'flags',) +optional_params = {} + +def check_guest_status(domobj): + """check guest current status + """ + state = domobj.info()[0] + if state == libvirt.VIR_DOMAIN_SHUTOFF or \ + state == libvirt.VIR_DOMAIN_SHUTDOWN: + return False + else: + return True + +def get_guest_network_info(params): + """get guest network interface info + """ + + logger = params['logger'] + guestname = params['guestname'] + flags = params['flags'] + + conn = sharedmod.libvirtobj['conn'] + + domobj = conn.lookupByName(guestname) + + flags = params['flags'] + logger.info("The flags are %s" % flags) + flags_string = flags.split("|") + flags = 0 + + for flag in flags_string: + if flag == 'lease': + flags |= libvirt.VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE + elif flag == 'agent': + flags |= libvirt.VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT + else: + logger.error("unknow flags") + return 1 + + logger.info("the given flags is %d" % flags) + + # Check domain status + if check_guest_status(domobj): + logger.info("Guest is running") + else: + logger.error("Guest is shut off status") + return 1 + + try: + info = domobj.interfaceAddresses(flags) + logger.info("get guest interface info") + + except libvirtError, e: + logger.error("API error message: %s, error code is %s" \ + % (e.message, e.get_error_code())) + return 1 + + return 0 + + -- 1.8.3.1

2 1

[libvirt] [PATCH tck 0/6] Update TCK for current libvirt/qemu environments
by Mike Latimer 09 Oct '15

09 Oct '15

Hi, TCK needs some changes in order to better handle current libvirt/qemu environments. This patch series contains patches to address most (not all*) of the issues I've been encountering: - IP addresses can no longer be retrieved from default.leases - NUMA flags AFFECT_LIVE and AFFECT_CONFIG are mutually exclusive - cow format is no longer supported by qemu - dnsmasq spawns a child process with the same process name and params In addition to the above fixes, additional delays improve the reliability of the nwfilter and hotplugging tests. Thanks, Mike * I'll post another series shortly, dealing with issues in 121-block-info.t. Mike Latimer (6): Retrieve ip address from arp instead of leases nwfilter startup and shutdown delay NUMA flags are exclusive Remove cow format tests Delay before hotplugging Handle dnsmasq child processes lib/Sys/Virt/TCK/NetworkHelpers.pm | 8 ++++---- scripts/domain/200-disk-hotplug.t | 1 + scripts/domain/202-numa-set-parameters.t | 14 +++++++++----- scripts/domain/210-nic-hotplug.t | 1 + scripts/domain/215-nic-hotplug-many.t | 1 + scripts/networks/networkxml2hostout/tck-testnet-1.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-2.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-3.dat | 2 +- scripts/nwfilter/100-ping-still-working.t | 4 ++-- scripts/nwfilter/210-no-mac-spoofing.t | 4 ++-- scripts/nwfilter/220-no-ip-spoofing.t | 15 ++++++++++++--- scripts/nwfilter/230-no-mac-broadcast.t | 4 ++-- scripts/nwfilter/240-no-arp-spoofing.t | 4 ++-- scripts/storage/100-create-vol-dir.t | 19 +------------------ scripts/storage/200-clone-vol-dir.t | 4 ++-- 15 files changed, 42 insertions(+), 43 deletions(-) -- 1.8.4.5

3 16

[libvirt] [PATCH] src: Generate virkeymaps.h into the correct directory
by Michal Privoznik 09 Oct '15

09 Oct '15

So after a9fe620372144db we are generating virkeymaps.h all the time during build. This is good. However, when doing a VPATH build, we are not generating it into the correct directory, since there's $(srcdir) prefix missing to the path to the file: make[2]: Entering directory `/home/jenkins/libvirt/systems/libvirt-fedora-20/build/src' GEN util/virkeymaps.h ... CC util/libvirt_util_la-virkeycode.lo CC util/libvirt_util_la-virkeyfile.lo CC util/libvirt_util_la-virlockspace.lo CC util/libvirt_util_la-virlog.lo ../../src/util/virkeycode.c:27:24: fatal error: virkeymaps.h: No such file or directory #include "virkeymaps.h" ^ compilation terminated. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Even though this would qualify as build breaker, I'm sending it for review. src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index e4660eb..0bf28cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -177,10 +177,10 @@ EXTRA_DIST += $(srcdir)/util/keymaps.csv $(srcdir)/util/virkeycode-mapgen.py BUILT_SOURCES += util/virkeymaps.h MAINTAINERCLEANFILES += util/virkeymaps.h -util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ +$(srcdir)/util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py $(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py \ - <$(srcdir)/util/keymaps.csv >util/virkeymaps.h + <$(srcdir)/util/keymaps.csv >$(srcdir)/util/virkeymaps.h # Internal generic driver infrastructure NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c nodeinfopriv.h -- 2.4.9

3 2

[libvirt] [PATCH v2 0/4] Be tolerant to relabel errors for session mode
by Michal Privoznik 08 Oct '15

08 Oct '15

This is a reworked version of my previous patch: https://www.redhat.com/archives/libvir-list/2015-July/msg00576.html Michal Privoznik (4): virSecuritySELinuxSetSecurityAllLabel: drop useless virFileIsSharedFSType security_selinux: Replace SELinuxSCSICallbackData with proper struct virSecurityManager: Track if running as privileged security_selinux: Take @privileged into account src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 3 +- src/qemu/qemu_driver.c | 7 +- src/security/security_manager.c | 29 ++++++-- src/security/security_manager.h | 5 +- src/security/security_selinux.c | 147 ++++++++++++++++++++++++--------------- tests/qemuhotplugtest.c | 2 +- tests/seclabeltest.c | 2 +- tests/securityselinuxlabeltest.c | 2 +- tests/securityselinuxtest.c | 2 +- 10 files changed, 127 insertions(+), 74 deletions(-) -- 2.4.6

3 6

[libvirt] [PATCH] vz: cleanup
by Maxim Nestratov 08 Oct '15

08 Oct '15

From: Maxim Nestratov <mnestratov(a)virtuozzo.com> Remove unused definitions, functions and structure fields. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_driver.c | 1 - src/vz/vz_utils.c | 67 ---------------------------------------------------- src/vz/vz_utils.h | 20 --------------- 3 files changed, 0 insertions(+), 88 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index d0b4692..15dc70f 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -262,7 +262,6 @@ vzOpenDefault(virConnectPtr conn) error: virObjectUnref(privconn->domains); virObjectUnref(privconn->caps); - virStoragePoolObjListFree(&privconn->pools); virObjectEventStateFree(privconn->domainEventState); prlsdkDisconnect(privconn); prlsdkDeinit(); diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 08b7f5a..894f7dd 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -115,33 +115,6 @@ vzDoCmdRun(char **outbuf, const char *binary, va_list list) } /* - * Run command and parse its JSON output, return - * pointer to virJSONValue or NULL in case of error. - */ -virJSONValuePtr -vzParseOutput(const char *binary, ...) -{ - char *outbuf; - virJSONValuePtr jobj = NULL; - va_list list; - int ret; - - va_start(list, binary); - ret = vzDoCmdRun(&outbuf, binary, list); - va_end(list); - if (ret) - return NULL; - - jobj = virJSONValueFromString(outbuf); - if (!jobj) - virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid output from prlctl: %s"), outbuf); - - VIR_FREE(outbuf); - return jobj; -} - -/* * Run command and return its output, pointer to * buffer or NULL in case of error. Caller os responsible * for freeing the buffer. @@ -161,43 +134,3 @@ vzGetOutput(const char *binary, ...) return outbuf; } - -/* - * Run prlctl command and check for errors - * - * Return value is 0 in case of success, else - -1 - */ -int -vzCmdRun(const char *binary, ...) -{ - int ret; - va_list list; - - va_start(list, binary); - ret = vzDoCmdRun(NULL, binary, list); - va_end(list); - - return ret; -} - -/* - * Return new file path in malloced string created by - * concatenating first and second function arguments. - */ -char * -vzAddFileExt(const char *path, const char *ext) -{ - char *new_path = NULL; - size_t len = strlen(path) + strlen(ext) + 1; - - if (VIR_ALLOC_N(new_path, len) < 0) - return NULL; - - if (!virStrcpy(new_path, path, len)) { - VIR_FREE(new_path); - return NULL; - } - strcat(new_path, ext); - - return new_path; -} diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index 77f49f0..84cf08f 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -27,11 +27,8 @@ # include "driver.h" # include "conf/domain_conf.h" -# include "conf/storage_conf.h" # include "conf/domain_event.h" -# include "conf/network_conf.h" # include "virthread.h" -# include "virjson.h" # define vzParseError() \ virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__, \ @@ -50,11 +47,6 @@ # define PARALLELS_DOMAIN_ROUTED_NETWORK_NAME "Routed" # define PARALLELS_DOMAIN_BRIDGED_NETWORK_NAME "Bridged" -# define PARALLELS_REQUIRED_HOSTONLY_NETWORK "Host-Only" -# define PARALLELS_HOSTONLY_NETWORK_TYPE "host-only" -# define PARALLELS_REQUIRED_BRIDGED_NETWORK "Bridged" -# define PARALLELS_BRIDGED_NETWORK_TYPE "bridged" - struct _vzConn { virMutex lock; @@ -62,12 +54,9 @@ struct _vzConn { virDomainObjListPtr domains; PRL_HANDLE server; - virStoragePoolObjList pools; - virNetworkObjListPtr networks; virCapsPtr caps; virDomainXMLOptionPtr xmlopt; virObjectEventStatePtr domainEventState; - virStorageDriverStatePtr storageState; const char *drivername; }; @@ -97,19 +86,10 @@ typedef struct vzDomObj *vzDomObjPtr; virDomainObjPtr vzDomObjFromDomain(virDomainPtr domain); virDomainObjPtr vzDomObjFromDomainRef(virDomainPtr domain); -virJSONValuePtr vzParseOutput(const char *binary, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; char * vzGetOutput(const char *binary, ...) ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; -int vzCmdRun(const char *binary, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; -char * vzAddFileExt(const char *path, const char *ext); void vzDriverLock(vzConnPtr driver); void vzDriverUnlock(vzConnPtr driver); -virStorageVolPtr vzStorageVolLookupByPathLocked(virConnectPtr conn, - const char *path); -int vzStorageVolDefRemove(virStoragePoolObjPtr privpool, - virStorageVolDefPtr privvol); # define PARALLELS_BLOCK_STATS_FOREACH(OP) \ OP(rd_req, VIR_DOMAIN_BLOCK_STATS_READ_REQ, "read_requests") \ -- 1.7.1

2 1

[libvirt] [PATCH] AUTHORS: Add myself to the list of committers
by Andrea Bolognani 08 Oct '15

08 Oct '15

--- Ján insisted so much. Pushed as trivial. AUTHORS.in | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.in b/AUTHORS.in index 7e4359f..d385fbc 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -8,6 +8,7 @@ Daniel Veillard <veillard(a)redhat.com> or <daniel(a)veillard.com> The primary maintainers and people with commit access rights: Alex Jia <ajia(a)redhat.com> +Andrea Bolognani <abologna(a)redhat.com> Cédric Bosdonnat <cbosdonnat(a)suse.com> Christophe Fergeau <cfergeau(a)redhat.com> Claudio Bley <claudio.bley(a)gmail.com> -- 2.4.3

1 0

[libvirt] [PATCH tck 0/3] Account for blockstats changes in 121-block-info.t
by Mike Latimer 08 Oct '15

08 Oct '15

Hi, Due to libvirt commit 0282ca45, 121-block-info.t fails as the allocation size returned by block-info is now zero. While addressing this, a few aspects of the test were also cleaned up. The changes are not extensive, but it made more sense to submit them in a series. Thanks, Mike Mike Latimer (3): Rename volume1 variables Reorder and add qcow tests Disk allocation should be zero scripts/domain/121-block-info.t | 65 +++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 28 deletions(-) -- 1.8.4.5

2 6

[libvirt] [sandbox] virt-sandbox-image: separate templates from the different sources
by Cédric Bosdonnat 08 Oct '15

08 Oct '15

Put templates files in a folder for the corresponding source to avoid potential name conflicts. --- libvirt-sandbox/image/cli.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/libvirt-sandbox/image/cli.py b/libvirt-sandbox/image/cli.py index d449a7b..9b9c00b 100755 --- a/libvirt-sandbox/image/cli.py +++ b/libvirt-sandbox/image/cli.py @@ -64,17 +64,21 @@ def debug(msg): def info(msg): sys.stdout.write(msg) +def get_template_dir(args): + tmpl = template.Template.from_uri(args.template) + return "%s/%s" % (args.template_dir, tmpl.source) + def delete(args): tmpl = template.Template.from_uri(args.template) source = tmpl.get_source_impl() source.delete_template(template=tmpl, - templatedir=args.template_dir) + templatedir=get_template_dir(args)) def create(args): tmpl = template.Template.from_uri(args.template) source = tmpl.get_source_impl() source.create_template(template=tmpl, - templatedir=args.template_dir, + templatedir=get_template_dir(args), connect=args.connect) def run(args): @@ -83,9 +87,10 @@ def run(args): tmpl = template.Template.from_uri(args.template) source = tmpl.get_source_impl() + template_dir = get_template_dir(args) # Create the template image if needed - if not source.has_template(tmpl, args.template_dir): + if not source.has_template(tmpl, template_dir): create(args) name = args.name @@ -94,11 +99,11 @@ def run(args): name = tmpl.path[1:] + ":" + randomid diskfile = source.get_disk(template=tmpl, - templatedir=args.template_dir, + templatedir=template_dir, imagedir=args.image_dir, sandboxname=name) - commandToRun = source.get_command(tmpl, args.template_dir, args.args) + commandToRun = source.get_command(tmpl, template_dir, args.args) if len(commandToRun) == 0: commandToRun = ["/bin/sh"] cmd = ['virt-sandbox', '--name', name] @@ -112,7 +117,7 @@ def run(args): params.append('-N') params.append(networkArgs) - allEnvs = source.get_env(tmpl, args.template_dir) + allEnvs = source.get_env(tmpl, template_dir) envArgs = args.env if envArgs is not None: allEnvs = allEnvs + envArgs @@ -128,7 +133,7 @@ def run(args): cmd = cmd + params + ['--'] + commandToRun subprocess.call(cmd) os.unlink(diskfile) - source.post_run(tmpl, args.template_dir, name) + source.post_run(tmpl, template_dir, name) def requires_template(parser): parser.add_argument("template", -- 2.1.4

2 1

Re: [libvirt] [PATCH v2] Close the source fd if the destination qemu exits during tunnelled migration
by John Ferlan 08 Oct '15

08 Oct '15

On 09/29/2015 10:06 AM, Shivaprasad bhat wrote: [...] >> Perhaps I should clarify my query-migrate has no timeout comment... It >> seems based on what I've read so far, the 'query-migrate' command >> started successfully, because if it hadn't we would have received a >> failure (as shown below). Thus libvirt has sent the command via the >> monitor and is waiting for a response (e.g. the virCondWait after the >> qemuMonitorSend in the trace below). The response isn't coming because >> either "A" qemu didn't send it back or "B" libvirt missed it - that >> should be determinable. >> >> There's a way to turn on debugging so the monitor dialog can be seen - >> via changes to /etc/libvirt/libvirtd.conf. I use : >> >> log_level = 1 >> log_filters="3:remote 4:event 3:json 3:rpc" >> log_outputs="1:file:/var/log/libvirt/libvirtd.log" >> >> But you may need to remove the "3:json" in order to see the dialog since >> that where it "feels like" the issue might be. Then start libvirtd in >> the debugger again. Once it's hung - you should be able to scan (eg, >> edit) the libvirtd.log file and search for the "query-migrate" command >> being sent and then follow the copious output looking for the presence >> of a returned command. If there is none, then something in qemu isn't >> returning the failure correctly and it would need to be fixed there I >> would think as opposed to throwing down the big hammer of closing the fd. > > Had a chance to run with your log settings. The query-migrate doesn't seem to > have a corresponding "return" in the logs. So as you say, there may be > a qemu bug > that is not returning a response when the fd is still open(as libvirt > didnt close it) but > no read actually happening there. I felt qemu can't sense the failure as the fd > is open, so posted this patch. Though, the qemu should return with the > current state > of migration as it sees instead of not returning at all. Hope we are > on the same page. > > Thanks, > Shivaprasad > Meant to respond yesterday but got wrapped up in other things. OK - so at least now it makes a bit more sense why purely adding a stream_abort didn't work - we're not getting a reply from the monitor. So there's perhaps 3 ways to "resolve" this issue (that come to my mind) 1. As you've done with the close() in the error path of qemuMigrationIOFunc when the virStream{Send|Finish} fails. Although this does feel like a work-around, I suppose since the tunnel is a libvirt created thing and qemu isn't aware of it, then it feels reasonable. Although that does make me wonder how qemu could be hung up. What would something like a "virsh qemu-monitor-command $dom '{"execute":"query-migrate"}' return when the source is hung? Or does it hang too? 2. Adding some sort of "timeout" logic in qemuMonitorSend (e.g. virCondWaitUntil instead of virCondWait) to handle when a command doesn't get a response. Not sure this is right either since it's not clear to me there is a "time" that "all" commands are guaranteed to be run in/by, especially async ones. 3. Dig into qemu to figure out why it's not returning anything for a migrate-status request. Currently a bit beyond what I've done, but I believe would require attaching into the running qemu process to see if there was some thread "stuck" somewhere "waiting" on something that won't return because the stream closed. Hopefully Jiri (or perhaps Daniel) could provide some other insights. John

2 1

[libvirt] [PATCH 0/4] storage: Add a 'created' boolean for buildVol[From]
by John Ferlan 08 Oct '15

08 Oct '15

In the review of a recent series dealing with a needing to refresh a pool prior to adding a new volume: http://www.redhat.com/archives/libvir-list/2015-October/msg00109.html it was noted that there would be a small timing window possible between the check and the actual volume creation attempt. Michal noted that we could add a 'created' type flag in order to "know" whether the libvirt API's created the volume or not during their buildVol API. As these things usually do, this also morphed into also needing the same boolean for the buildVolFrom API. So that's what this series does... Ok mostly, patch 1 doesn't have anything to do with this, but I saw the anomaly why working my way through the code. John Ferlan (4): storage: Perform some cleanup of calls storage: Add created to virFileOpenAs storage: Add created to virDirCreate storage: Add checks for buildVol create file src/libxl/libxl_domain.c | 3 ++- src/libxl/libxl_driver.c | 3 ++- src/qemu/qemu_driver.c | 7 +++++-- src/qemu/qemu_process.c | 6 +++--- src/storage/storage_backend.c | 28 ++++++++++++++++------------ src/storage/storage_backend.h | 3 +++ src/storage/storage_backend_disk.c | 3 ++- src/storage/storage_backend_fs.c | 22 +++++++++++++++++----- src/storage/storage_backend_logical.c | 3 ++- src/storage/storage_backend_rbd.c | 2 ++ src/storage/storage_backend_sheepdog.c | 2 ++ src/storage/storage_driver.c | 16 +++++++++++----- src/util/virfile.c | 23 ++++++++++++++++++----- src/util/virfile.h | 4 ++-- src/util/virstoragefile.c | 3 ++- 15 files changed, 89 insertions(+), 39 deletions(-) -- 2.1.0

2 10

[libvirt] [PATCH v4] qemu: Validate address type when attaching a disk device.
by Ruifeng Bian 08 Oct '15

08 Oct '15

Bug fix for: https://bugzilla.redhat.com/show_bug.cgi?id=1257844 Attach-device can hotplug a virtio disk device with any address type now, it need to validate the address type before the attachment. Attaching a disk device with --config option need to check address type. Otherwise, the domain cloudn't be started normally. This patch add a basic check for address type. Detaching a disk device with --config also need to check disk options, add qemuCheckDiskConfig() method in qemuDomainDetachDeviceConfig(). Add virDomainDeviceAddressTypeIsValid method in domain_conf to check disk address type. Address type should match with disk driver, report error messages if any mismatch. Signed-off-by: Ruifeng Bian <rbian(a)redhat.com> --- src/conf/domain_conf.c | 32 ++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 7 +++++++ src/qemu/qemu_driver.c | 2 ++ src/qemu/qemu_hotplug.c | 22 ++++++++++++++++++++++ 6 files changed, 65 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6df1618..f86760b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3200,6 +3200,38 @@ int virDomainDeviceAddressIsValid(virDomainDeviceInfoPtr info, return 0; } +int virDomainDeviceAddressTypeIsValid(virDomainDiskDefPtr disk) +{ + if (disk->info.type) { + switch (disk->bus) { + case VIR_DOMAIN_DISK_BUS_IDE: + case VIR_DOMAIN_DISK_BUS_SCSI: + case VIR_DOMAIN_DISK_BUS_SATA: + case VIR_DOMAIN_DISK_BUS_FDC: + if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) + return 1; + break; + case VIR_DOMAIN_DISK_BUS_USB: + if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) + return 1; + break; + case VIR_DOMAIN_DISK_BUS_VIRTIO: + if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && + disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 && + disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO && + disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + return 1; + break; + case VIR_DOMAIN_DISK_BUS_XEN: + case VIR_DOMAIN_DISK_BUS_UML: + case VIR_DOMAIN_DISK_BUS_SD: + /* no address type currently, return false if address provided */ + return 1; + } + } + return 0; +} + virDomainDeviceInfoPtr virDomainDeviceGetInfo(virDomainDeviceDefPtr device) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f043554..337fe51 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2543,6 +2543,7 @@ virDomainDeviceDefPtr virDomainDeviceDefCopy(virDomainDeviceDefPtr src, virDomainXMLOptionPtr xmlopt); int virDomainDeviceAddressIsValid(virDomainDeviceInfoPtr info, int type); +int virDomainDeviceAddressTypeIsValid(virDomainDiskDefPtr disk); virDomainDeviceInfoPtr virDomainDeviceGetInfo(virDomainDeviceDefPtr device); int virDomainDeviceInfoCopy(virDomainDeviceInfoPtr dst, virDomainDeviceInfoPtr src); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5b3da83..6cd5b9e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -229,6 +229,7 @@ virDomainDefPostParse; virDomainDefSetMemoryInitial; virDomainDeleteConfig; virDomainDeviceAddressIsValid; +virDomainDeviceAddressTypeIsValid; virDomainDeviceAddressTypeToString; virDomainDeviceDefCheckUnsupportedMemoryDevice; virDomainDeviceDefCopy; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 25f57f2..56ba08d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3606,6 +3606,13 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk) goto error; } } + + if (virDomainDeviceAddressTypeIsValid(disk)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("disk cannot have an address of type '%s'"), + virDomainDeviceAddressTypeToString(disk->info.type)); + goto error; + } return 0; error: return -1; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fcf86b6..26c1502 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8208,6 +8208,8 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, switch ((virDomainDeviceType) dev->type) { case VIR_DOMAIN_DEVICE_DISK: disk = dev->data.disk; + if (qemuCheckDiskConfig(disk) < 0) + return -1; if (!(det_disk = virDomainDiskRemoveByName(vmdef, disk->dst))) { virReportError(VIR_ERR_INVALID_ARG, _("no target device %s"), disk->dst); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e84a78d..6156243 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -336,6 +336,28 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (!qemuCheckCCWS390AddressSupport(vm->def, disk->info, priv->qemuCaps, disk->dst)) goto cleanup; + + if (qemuDomainMachineIsS390CCW(vm->def) && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW)) { + if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid CCW address")); + goto cleanup; + } + } else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) { + if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid S390 address")); + goto cleanup; + } + } else if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid PCI address")); + goto cleanup; + } } for (i = 0; i < vm->def->ndisks; i++) { -- 2.4.3

2 2

[libvirt] [PATCH 0/8] Resolve some storage and disk backend issues
by John Ferlan 08 Oct '15

08 Oct '15

The following patches resolve a few issues either explicitly generated via a bz or seen while investigating/testing the results from bzs. Patches 1-2 were discovered while working through patch 3. I found that deleting volumes from a pool was always going through the fork processing. I neglected to recall that when the volume was placed into the pool the mode, uid, & gid values can be updated. Thus on some delete paths we may not be called with -1 values. Because we were going through the fork processing I found that the error message displayed when a volume target no longer exists was wrong - that is the caller was expecting a return of -1 and errno being set. In this case looking for ENOENT and continuing on with removal of the volume from the pool. Patch 3 stands by itself - it's certainly one of those that could be deemed don't do that, but since we do check whether the volume was removed without libvirt doing the removal, I guess we should check whether the volume exists before trying to create it and using the refresh pool is the simplest mechanism for all pools. Patches 4-7 are intertwined - the disk backend code made the assumption that the volume/device being used for the pool was "good". The normal mode of operation is to define, build, start, but there's never been a "guarantee" or check that what is "on" the volume is valid for the type of pool Patch 8 was disk backend related - so while I'm in the code, I may as well make the change as well. John Ferlan (8): virfile: Add extra check for direct delete in virFileRemove virfile: Fix error path for forked virFileRemove storage: Prior to creating a volume, refresh the pool storage: Refactor disk label checking storage: Add param to check whether we can write a disk label storage: Add additional errors/checks for disk label storage: Introduce virStorageBackendDiskStartPool storage: Adjust calculation of alloc/capacity for disk src/libvirt_private.syms | 1 + src/storage/storage_backend_disk.c | 162 ++++++++++++++++++++++++++++++------- src/storage/storage_driver.c | 9 +++ src/util/virfile.c | 11 ++- 4 files changed, 151 insertions(+), 32 deletions(-) -- 2.1.0

3 14

[libvirt] [PATCH v2 0/6] Fix some Coverity issues
by John Ferlan 08 Oct '15

08 Oct '15

This series is based off the review of patch 1 from the series: http://www.redhat.com/archives/libvir-list/2015-September/msg00841.html In review of patch 1: http://www.redhat.com/archives/libvir-list/2015-September/msg00859.html it was noted that instead of using sa_assert, the proper checks should be made. During investigation, I found that while the caller could check for a non-NULL "first" parameter that ends up being used for strtok_r, that was not "good enough" for Coverity which still needed to consider the function where the to be first param cannot be NULL. In any case, I separated out each into their own patch rather than lumping them together. Patches 1-4 should be relatively straightforward. Patch 5 is new - it's one that I had been working on and finally figured out what the issue is/was. It was a bit more complex and hidden. Patch 6 was from the original patch 1, but it's review had a comment regarding using virBitmap* instead of the open coding. This one I believe I have intoned the magic words to make it better, but since I don't use xenapi, perhaps extra care would be necessary to make sure I got it right. John Ferlan (6): openvz: Resolve Coverity FORWARD_NULL openvz: Resolve Coverity FORWARD_NULL libxl: Resolve Coverity FORWARD_NULL esx: Resolve Coverity FORWARD_NULL qemu: Resolve Coverity FORWARD_NULL xenapi: Resolve Coverity FORWARD_NULL src/esx/esx_vi.c | 5 +++++ src/libxl/libxl_conf.c | 6 ++++++ src/openvz/openvz_conf.c | 8 ++++---- src/qemu/qemu_process.c | 14 ++++++++++++-- src/xenapi/xenapi_driver.c | 12 +++++++----- src/xenapi/xenapi_utils.c | 21 --------------------- src/xenapi/xenapi_utils.h | 2 -- 7 files changed, 34 insertions(+), 34 deletions(-) -- 2.1.0

2 15

[libvirt] [PATCH] tests: eventtest: Fix coverity warning
by Cole Robinson 07 Oct '15

07 Oct '15

We can ignore the result of virtTestResult here, because failure is unconditionally reported by the callers --- tests/eventtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/eventtest.c b/tests/eventtest.c index 625be86..c4be606 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -92,7 +92,7 @@ testEventReport(const char *name, bool failed, const char *msg, ...) data.failed = failed; data.msg = str; - virtTestRun(name, testEventResultCallback, &data); + ignore_value(virtTestRun(name, testEventResultCallback, &data)); va_end(vargs); VIR_FREE(str); -- 2.5.0

2 1

[libvirt] [PATCH] virSecurityManagerNew: Turn array of booleans into flags
by Michal Privoznik 07 Oct '15

07 Oct '15

So imagine you want to crate new security manager: if (!(mgr = virSecurityManagerNew("selinux", "QEMU", false, true, false, true))); Hard to parse, right? What about this: if (!(mgr = virSecurityManagerNew("selinux", "QEMU", VIR_SECURITY_MANAGER_DEFAULT_CONFINED | VIR_SECURITY_MANAGER_PRIVILEGED))); Now that's better! This is what the commit does. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/lxc/lxc_controller.c | 3 +- src/lxc/lxc_driver.c | 14 +++++--- src/qemu/qemu_driver.c | 28 ++++++++-------- src/security/security_manager.c | 70 +++++++++++++--------------------------- src/security/security_manager.h | 25 ++++++++------ tests/qemuhotplugtest.c | 3 +- tests/seclabeltest.c | 2 +- tests/securityselinuxlabeltest.c | 4 ++- tests/securityselinuxtest.c | 4 ++- 9 files changed, 72 insertions(+), 81 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index b064919..3e5d2b4 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2645,8 +2645,7 @@ int main(int argc, char *argv[]) ctrl->handshakeFd = handshakeFd; if (!(ctrl->securityManager = virSecurityManagerNew(securityDriver, - LXC_DRIVER_NAME, - false, false, false, false))) + LXC_DRIVER_NAME, 0))) goto cleanup; if (ctrl->def->seclabels) { diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b408be0..1a9550e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1556,13 +1556,17 @@ static int lxcCheckNetNsSupport(void) static virSecurityManagerPtr lxcSecurityInit(virLXCDriverConfigPtr cfg) { + unsigned int flags = VIR_SECURITY_MANAGER_PRIVILEGED; + VIR_INFO("lxcSecurityInit %s", cfg->securityDriverName); + + if (cfg->securityDefaultConfined) + flags |= VIR_SECURITY_MANAGER_DEFAULT_CONFINED; + if (cfg->securityRequireConfined) + flags |= VIR_SECURITY_MANAGER_REQUIRE_CONFINED; + virSecurityManagerPtr mgr = virSecurityManagerNew(cfg->securityDriverName, - LXC_DRIVER_NAME, - false, - cfg->securityDefaultConfined, - cfg->securityRequireConfined, - true); + LXC_DRIVER_NAME, flags); if (!mgr) goto error; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aff1915..598d159 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -389,6 +389,16 @@ qemuSecurityInit(virQEMUDriverPtr driver) virSecurityManagerPtr mgr = NULL; virSecurityManagerPtr stack = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + unsigned int flags = 0; + + if (cfg->allowDiskFormatProbing) + flags |= VIR_SECURITY_MANAGER_ALLOW_DISK_PROBE; + if (cfg->securityDefaultConfined) + flags |= VIR_SECURITY_MANAGER_DEFAULT_CONFINED; + if (cfg->securityRequireConfined) + flags |= VIR_SECURITY_MANAGER_REQUIRE_CONFINED; + if (virQEMUDriverIsPrivileged(driver)) + flags |= VIR_SECURITY_MANAGER_PRIVILEGED; if (cfg->securityDriverNames && cfg->securityDriverNames[0]) { @@ -396,10 +406,7 @@ qemuSecurityInit(virQEMUDriverPtr driver) while (names && *names) { if (!(mgr = virSecurityManagerNew(*names, QEMU_DRIVER_NAME, - cfg->allowDiskFormatProbing, - cfg->securityDefaultConfined, - cfg->securityRequireConfined, - virQEMUDriverIsPrivileged(driver)))) + flags))) goto error; if (!stack) { if (!(stack = virSecurityManagerNewStack(mgr))) @@ -414,10 +421,7 @@ qemuSecurityInit(virQEMUDriverPtr driver) } else { if (!(mgr = virSecurityManagerNew(NULL, QEMU_DRIVER_NAME, - cfg->allowDiskFormatProbing, - cfg->securityDefaultConfined, - cfg->securityRequireConfined, - virQEMUDriverIsPrivileged(driver)))) + flags))) goto error; if (!(stack = virSecurityManagerNewStack(mgr))) goto error; @@ -425,14 +429,12 @@ qemuSecurityInit(virQEMUDriverPtr driver) } if (virQEMUDriverIsPrivileged(driver)) { + if (cfg->dynamicOwnership) + flags |= VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP; if (!(mgr = virSecurityManagerNewDAC(QEMU_DRIVER_NAME, cfg->user, cfg->group, - cfg->allowDiskFormatProbing, - cfg->securityDefaultConfined, - cfg->securityRequireConfined, - cfg->dynamicOwnership, - virQEMUDriverIsPrivileged(driver), + flags, qemuSecurityChownCallback))) goto error; if (!stack) { diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 28d7dfd..46b1a25 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -37,10 +37,7 @@ struct _virSecurityManager { virObjectLockable parent; virSecurityDriverPtr drv; - bool allowDiskFormatProbing; - bool defaultConfined; - bool requireConfined; - bool privileged; + unsigned int flags; const char *virtDriver; void *privateData; }; @@ -77,10 +74,7 @@ VIR_ONCE_GLOBAL_INIT(virSecurityManager); static virSecurityManagerPtr virSecurityManagerNewDriver(virSecurityDriverPtr drv, const char *virtDriver, - bool allowDiskFormatProbing, - bool defaultConfined, - bool requireConfined, - bool privileged) + unsigned int flags) { virSecurityManagerPtr mgr; char *privateData; @@ -88,11 +82,10 @@ virSecurityManagerNewDriver(virSecurityDriverPtr drv, if (virSecurityManagerInitialize() < 0) return NULL; - VIR_DEBUG("drv=%p (%s) virtDriver=%s allowDiskFormatProbing=%d " - "defaultConfined=%d requireConfined=%d privileged=%d", - drv, drv->name, virtDriver, - allowDiskFormatProbing, defaultConfined, - requireConfined, privileged); + VIR_DEBUG("drv=%p (%s) virtDriver=%s flags=%x", + drv, drv->name, virtDriver, flags); + + virCheckFlags(VIR_SECURITY_MANAGER_NEW_MASK, NULL); if (VIR_ALLOC_N(privateData, drv->privateDataLen) < 0) return NULL; @@ -103,10 +96,7 @@ virSecurityManagerNewDriver(virSecurityDriverPtr drv, } mgr->drv = drv; - mgr->allowDiskFormatProbing = allowDiskFormatProbing; - mgr->defaultConfined = defaultConfined; - mgr->requireConfined = requireConfined; - mgr->privileged = privileged; + mgr->flags = flags; mgr->virtDriver = virtDriver; mgr->privateData = privateData; @@ -125,10 +115,7 @@ virSecurityManagerNewStack(virSecurityManagerPtr primary) virSecurityManagerPtr mgr = virSecurityManagerNewDriver(&virSecurityDriverStack, virSecurityManagerGetDriver(primary), - virSecurityManagerGetAllowDiskFormatProbing(primary), - virSecurityManagerGetDefaultConfined(primary), - virSecurityManagerGetRequireConfined(primary), - virSecurityManagerGetPrivileged(primary)); + primary->flags); if (!mgr) return NULL; @@ -153,20 +140,13 @@ virSecurityManagerPtr virSecurityManagerNewDAC(const char *virtDriver, uid_t user, gid_t group, - bool allowDiskFormatProbing, - bool defaultConfined, - bool requireConfined, - bool dynamicOwnership, - bool privileged, + unsigned int flags, virSecurityManagerDACChownCallback chownCallback) { virSecurityManagerPtr mgr = virSecurityManagerNewDriver(&virSecurityDriverDAC, virtDriver, - allowDiskFormatProbing, - defaultConfined, - requireConfined, - privileged); + flags & VIR_SECURITY_MANAGER_NEW_MASK); if (!mgr) return NULL; @@ -176,7 +156,7 @@ virSecurityManagerNewDAC(const char *virtDriver, return NULL; } - virSecurityDACSetDynamicOwnership(mgr, dynamicOwnership); + virSecurityDACSetDynamicOwnership(mgr, flags & VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP); virSecurityDACSetChownCallback(mgr, chownCallback); return mgr; @@ -186,10 +166,7 @@ virSecurityManagerNewDAC(const char *virtDriver, virSecurityManagerPtr virSecurityManagerNew(const char *name, const char *virtDriver, - bool allowDiskFormatProbing, - bool defaultConfined, - bool requireConfined, - bool privileged) + unsigned int flags) { virSecurityDriverPtr drv = virSecurityDriverLookup(name, virtDriver); if (!drv) @@ -197,13 +174,13 @@ virSecurityManagerNew(const char *name, /* driver "none" needs some special handling of *Confined bools */ if (STREQ(drv->name, "none")) { - if (requireConfined) { + if (flags & VIR_SECURITY_MANAGER_REQUIRE_CONFINED) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Security driver \"none\" cannot create confined guests")); return NULL; } - if (defaultConfined) { + if (flags & VIR_SECURITY_MANAGER_DEFAULT_CONFINED) { if (name != NULL) { VIR_WARN("Configured security driver \"none\" disables default" " policy to create confined guests"); @@ -211,16 +188,13 @@ virSecurityManagerNew(const char *name, VIR_DEBUG("Auto-probed security driver is \"none\";" " confined guests will not be created"); } - defaultConfined = false; + flags &= ~VIR_SECURITY_MANAGER_DEFAULT_CONFINED; } } return virSecurityManagerNewDriver(drv, virtDriver, - allowDiskFormatProbing, - defaultConfined, - requireConfined, - privileged); + flags); } @@ -323,28 +297,28 @@ virSecurityManagerGetBaseLabel(virSecurityManagerPtr mgr, bool virSecurityManagerGetAllowDiskFormatProbing(virSecurityManagerPtr mgr) { - return mgr->allowDiskFormatProbing; + return mgr->flags & VIR_SECURITY_MANAGER_ALLOW_DISK_PROBE; } bool virSecurityManagerGetDefaultConfined(virSecurityManagerPtr mgr) { - return mgr->defaultConfined; + return mgr->flags & VIR_SECURITY_MANAGER_DEFAULT_CONFINED; } bool virSecurityManagerGetRequireConfined(virSecurityManagerPtr mgr) { - return mgr->requireConfined; + return mgr->flags & VIR_SECURITY_MANAGER_REQUIRE_CONFINED; } bool virSecurityManagerGetPrivileged(virSecurityManagerPtr mgr) { - return mgr->privileged; + return mgr->flags & VIR_SECURITY_MANAGER_PRIVILEGED; } @@ -611,7 +585,7 @@ virSecurityManagerGenLabel(virSecurityManagerPtr mgr, } if (seclabel->type == VIR_DOMAIN_SECLABEL_DEFAULT) { - if (sec_managers[i]->defaultConfined) { + if (virSecurityManagerGetDefaultConfined(sec_managers[i])) { seclabel->type = VIR_DOMAIN_SECLABEL_DYNAMIC; } else { seclabel->type = VIR_DOMAIN_SECLABEL_NONE; @@ -620,7 +594,7 @@ virSecurityManagerGenLabel(virSecurityManagerPtr mgr, } if (seclabel->type == VIR_DOMAIN_SECLABEL_NONE) { - if (sec_managers[i]->requireConfined) { + if (virSecurityManagerGetRequireConfined(sec_managers[i])) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Unconfined guests are not allowed on this host")); goto cleanup; diff --git a/src/security/security_manager.h b/src/security/security_manager.h index 53e56f6..e534e31 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -30,12 +30,23 @@ typedef struct _virSecurityManager virSecurityManager; typedef virSecurityManager *virSecurityManagerPtr; +typedef enum { + VIR_SECURITY_MANAGER_ALLOW_DISK_PROBE = 1 << 0, + VIR_SECURITY_MANAGER_DEFAULT_CONFINED = 1 << 1, + VIR_SECURITY_MANAGER_REQUIRE_CONFINED = 1 << 2, + VIR_SECURITY_MANAGER_PRIVILEGED = 1 << 3, + VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP = 1 << 4, +} virSecurityManagerNewFlags; + +# define VIR_SECURITY_MANAGER_NEW_MASK \ + (VIR_SECURITY_MANAGER_ALLOW_DISK_PROBE | \ + VIR_SECURITY_MANAGER_DEFAULT_CONFINED | \ + VIR_SECURITY_MANAGER_REQUIRE_CONFINED | \ + VIR_SECURITY_MANAGER_PRIVILEGED) + virSecurityManagerPtr virSecurityManagerNew(const char *name, const char *virtDriver, - bool allowDiskFormatProbing, - bool defaultConfined, - bool requireConfined, - bool privileged); + unsigned int flags); virSecurityManagerPtr virSecurityManagerNewStack(virSecurityManagerPtr primary); int virSecurityManagerStackAddNested(virSecurityManagerPtr stack, @@ -59,11 +70,7 @@ typedef int virSecurityManagerPtr virSecurityManagerNewDAC(const char *virtDriver, uid_t user, gid_t group, - bool allowDiskFormatProbing, - bool defaultConfined, - bool requireConfined, - bool dynamicOwnership, - bool privileged, + unsigned int flags, virSecurityManagerDACChownCallback chownCallback); int virSecurityManagerPreFork(virSecurityManagerPtr mgr); diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 2135b5a..2c5c48f 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -364,7 +364,8 @@ mymain(void) if (!driver.lockManager) return EXIT_FAILURE; - if (!(mgr = virSecurityManagerNew("none", "qemu", false, false, false, true))) + if (!(mgr = virSecurityManagerNew("none", "qemu", + VIR_SECURITY_MANAGER_PRIVILEGED))) return EXIT_FAILURE; if (!(driver.securityManager = virSecurityManagerNewStack(mgr))) return EXIT_FAILURE; diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c index 93ddcbb..6b1e789 100644 --- a/tests/seclabeltest.c +++ b/tests/seclabeltest.c @@ -17,7 +17,7 @@ main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) if (virThreadInitialize() < 0) return EXIT_FAILURE; - mgr = virSecurityManagerNew(NULL, "QEMU", false, true, false, false); + mgr = virSecurityManagerNew(NULL, "QEMU", VIR_SECURITY_MANAGER_DEFAULT_CONFINED); if (mgr == NULL) { fprintf(stderr, "Failed to start security driver"); return EXIT_FAILURE; diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 4b8fa6f..86660f4 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -351,7 +351,9 @@ mymain(void) if (!rc) return EXIT_AM_SKIP; - if (!(mgr = virSecurityManagerNew("selinux", "QEMU", false, true, false, true))) { + if (!(mgr = virSecurityManagerNew("selinux", "QEMU", + VIR_SECURITY_MANAGER_DEFAULT_CONFINED | + VIR_SECURITY_MANAGER_PRIVILEGED))) { virErrorPtr err = virGetLastError(); VIR_TEST_VERBOSE("Unable to initialize security driver: %s\n", err->message); diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 3a7862f..49694f3 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -272,7 +272,9 @@ mymain(void) int ret = 0; virSecurityManagerPtr mgr; - if (!(mgr = virSecurityManagerNew("selinux", "QEMU", false, true, false, true))) { + if (!(mgr = virSecurityManagerNew("selinux", "QEMU", + VIR_SECURITY_MANAGER_DEFAULT_CONFINED | + VIR_SECURITY_MANAGER_PRIVILEGED))) { virErrorPtr err = virGetLastError(); fprintf(stderr, "Unable to initialize security driver: %s\n", err->message); -- 2.4.9

2 1

[libvirt] [PATCH 0/3] tests: Drop virtTestResult
by Cole Robinson 07 Oct '15

07 Oct '15

virtTestResult poorly duplicates logic from virtTestRun. We could fix it, but there's really only one legitimate user in eventtest.c, so drop the improper users, and opencode the legit usage. More justification in the last patch Thanks, Cole Cole Robinson (3): tests: sheepdog: Drop use of virtTestResult tests: eventtest: Open code virtTestResult testutils: Drop virtTestResult tests/eventtest.c | 57 ++++++++++++++++++++++++++++------ tests/storagebackendsheepdogtest.c | 63 ++++++++++++++++++++++++++++---------- tests/testutils.c | 38 ----------------------- tests/testutils.h | 2 -- 4 files changed, 94 insertions(+), 66 deletions(-) -- 2.5.0

3 9

[libvirt] [PATCH 0/2] tests: Add nodeinfo test data utility scripts
by Andrea Bolognani 07 Oct '15

07 Oct '15

Both scripts can be useful when adding new test cases to the nodeinfo test. Andrea Bolognani (2): tests: Add script to display nodeinfo test data tests: Add script to copy nodeinfo test data from host tests/nodeinfodata/copy-from-host.sh | 170 +++++++++++++++++++++++++++++++++++ tests/nodeinfodata/display.sh | 101 +++++++++++++++++++++ 2 files changed, 271 insertions(+) create mode 100755 tests/nodeinfodata/copy-from-host.sh create mode 100755 tests/nodeinfodata/display.sh -- 2.4.3

2 5

[libvirt] [PATCH v2] qemu: Remove explicit values from virQEMUCapsFlags
by Andrea Bolognani 07 Oct '15

07 Oct '15

This gets rid of the partially enforced alignment and makes it less likely for a bogus value to be introduced in the enumeration. Use #define for QEMU_CAPS_NET_NAME and QEMU_CAPS_HOST_NET_ADD, both of which are aliases for QEMU_CAPS_0_10. --- First attempt was [libvirt] [PATCH] qemu: Align virQEMUCapsFlags members https://www.redhat.com/archives/libvir-list/2015-October/msg00112.html Changes based on suggestions from Dan and Jirka. src/qemu/qemu_capabilities.h | 415 +++++++++++++++++++++---------------------- 1 file changed, 206 insertions(+), 209 deletions(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index a1d98d0..b5b1af4 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -32,217 +32,214 @@ /* Internal flags to keep track of qemu command line capabilities */ typedef enum { - QEMU_CAPS_KQEMU = 0, /* Whether KQEMU is compiled in */ - QEMU_CAPS_VNC_COLON = 1, /* VNC takes or address + display */ - QEMU_CAPS_NO_REBOOT = 2, /* Is the -no-reboot flag available */ - QEMU_CAPS_DRIVE = 3, /* Is the new -drive arg available */ - QEMU_CAPS_DRIVE_BOOT = 4, /* Does -drive support boot=on */ - QEMU_CAPS_NAME = 5, /* Is the -name flag available */ - QEMU_CAPS_UUID = 6, /* Is the -uuid flag available */ - QEMU_CAPS_DOMID = 7, /* Xenner: -domid flag available */ - QEMU_CAPS_VNET_HDR = 8, - QEMU_CAPS_MIGRATE_KVM_STDIO = 9, /* avoid kvm tcp migration bug */ - QEMU_CAPS_MIGRATE_QEMU_TCP = 10, /* have qemu tcp migration */ - QEMU_CAPS_MIGRATE_QEMU_EXEC = 11, /* have qemu exec migration */ - QEMU_CAPS_DRIVE_CACHE_V2 = 12, /* cache= flag wanting new v2 values */ - QEMU_CAPS_KVM = 13, /* Whether KVM is enabled by default */ - QEMU_CAPS_DRIVE_FORMAT = 14, /* Is -drive format= avail */ - QEMU_CAPS_VGA = 15, /* Is -vga avail */ - - /* features added in qemu-0.10.0 or later */ - QEMU_CAPS_0_10 = 16, - QEMU_CAPS_NET_NAME = QEMU_CAPS_0_10, /* -net ...,name=str */ - QEMU_CAPS_HOST_NET_ADD = QEMU_CAPS_0_10, /* host_net_add command */ - - QEMU_CAPS_PCIDEVICE = 17, /* PCI device assignment supported */ - QEMU_CAPS_MEM_PATH = 18, /* mmap'ped guest backing supported */ - QEMU_CAPS_DRIVE_SERIAL = 19, /* -driver serial= available */ - QEMU_CAPS_XEN_DOMID = 20, /* -xen-domid */ - QEMU_CAPS_MIGRATE_QEMU_UNIX = 21, /* qemu migration via unix sockets */ - QEMU_CAPS_CHARDEV = 22, /* Is the new -chardev arg available */ - QEMU_CAPS_ENABLE_KVM = 23, /* -enable-kvm flag */ - QEMU_CAPS_MONITOR_JSON = 24, /* JSON mode for monitor */ - QEMU_CAPS_BALLOON = 25, /* -balloon available */ - QEMU_CAPS_DEVICE = 26, /* Is the new -device arg available */ - QEMU_CAPS_SDL = 27, /* Is the new -sdl arg available */ - QEMU_CAPS_SMP_TOPOLOGY = 28, /* -smp has sockets/cores/threads */ - QEMU_CAPS_NETDEV = 29, /* -netdev flag & netdev_add/remove */ - QEMU_CAPS_RTC = 30, /* The -rtc flag for clock options */ - QEMU_CAPS_VHOST_NET = 31, /* vhost-net support available */ - QEMU_CAPS_RTC_TD_HACK = 32, /* -rtc-td-hack available */ - QEMU_CAPS_NO_HPET = 33, /* -no-hpet flag is supported */ - QEMU_CAPS_NO_KVM_PIT = 34, /* -no-kvm-pit-reinjection supported */ - QEMU_CAPS_TDF = 35, /* -tdf flag (user-mode pit catchup) */ - QEMU_CAPS_PCI_CONFIGFD = 36, /* pci-assign.configfd */ - QEMU_CAPS_NODEFCONFIG = 37, /* -nodefconfig */ - QEMU_CAPS_BOOT_MENU = 38, /* -boot menu=on support */ - QEMU_CAPS_ENABLE_KQEMU = 39, /* -enable-kqemu flag */ - QEMU_CAPS_FSDEV = 40, /* -fstype filesystem passthrough */ - QEMU_CAPS_NESTING = 41, /* -enable-nesting (SVM/VMX) */ - QEMU_CAPS_NAME_PROCESS = 42, /* Is -name process= available */ - QEMU_CAPS_DRIVE_READONLY = 43, /* -drive readonly=on|off */ - QEMU_CAPS_SMBIOS_TYPE = 44, /* Is -smbios type= available */ - QEMU_CAPS_VGA_QXL = 45, /* The 'qxl' arg for '-vga' */ - QEMU_CAPS_SPICE = 46, /* Is -spice avail */ - QEMU_CAPS_VGA_NONE = 47, /* The 'none' arg for '-vga' */ - QEMU_CAPS_MIGRATE_QEMU_FD = 48, /* -incoming fd:n */ - QEMU_CAPS_BOOTINDEX = 49, /* -device bootindex property */ - QEMU_CAPS_HDA_DUPLEX = 50, /* -device hda-duplex */ - QEMU_CAPS_DRIVE_AIO = 51, /* -drive aio= supported */ - QEMU_CAPS_PCI_MULTIBUS = 52, /* bus=pci.0 vs bus=pci */ - QEMU_CAPS_PCI_BOOTINDEX = 53, /* pci-assign.bootindex */ - QEMU_CAPS_CCID_EMULATED = 54, /* -device ccid-card-emulated */ - QEMU_CAPS_CCID_PASSTHRU = 55, /* -device ccid-card-passthru */ - QEMU_CAPS_CHARDEV_SPICEVMC = 56, /* newer -chardev spicevmc */ - QEMU_CAPS_DEVICE_SPICEVMC = 57, /* older -device spicevmc*/ - QEMU_CAPS_VIRTIO_TX_ALG = 58, /* -device virtio-net-pci,tx=string */ - QEMU_CAPS_DEVICE_QXL_VGA = 59, /* primary qxl device named qxl-vga? */ - QEMU_CAPS_PCI_MULTIFUNCTION = 60, /* -device multifunction=on|off */ - QEMU_CAPS_VIRTIO_IOEVENTFD = 61, /* virtio-{net|blk}-pci.ioeventfd=on */ - QEMU_CAPS_SGA = 62, /* Serial Graphics Adapter */ - QEMU_CAPS_VIRTIO_BLK_EVENT_IDX = 63, /* virtio-blk-pci.event_idx */ - QEMU_CAPS_VIRTIO_NET_EVENT_IDX = 64, /* virtio-net-pci.event_idx */ - QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC = 65, /* Is cache=directsync supported? */ - QEMU_CAPS_PIIX3_USB_UHCI = 66, /* -device piix3-usb-uhci */ - QEMU_CAPS_PIIX4_USB_UHCI = 67, /* -device piix4-usb-uhci */ - QEMU_CAPS_USB_EHCI = 68, /* -device usb-ehci */ - QEMU_CAPS_ICH9_USB_EHCI1 = 69, /* -device ich9-usb-ehci1 and friends */ - QEMU_CAPS_VT82C686B_USB_UHCI = 70, /* -device vt82c686b-usb-uhci */ - QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ - QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ - QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ - QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ - QEMU_CAPS_DRIVE_CACHE_UNSAFE = 75, /* Is cache=unsafe supported? */ - QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */ - QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ - QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ - QEMU_CAPS_FSDEV_READONLY = 79, /* -fsdev readonly supported */ - QEMU_CAPS_VIRTIO_BLK_SCSI = 80, /* virtio-blk-pci.scsi */ - QEMU_CAPS_VIRTIO_BLK_SG_IO = 81, /* SG_IO commands, since 0.11 */ - QEMU_CAPS_DRIVE_COPY_ON_READ = 82, /* -drive copy-on-read */ - QEMU_CAPS_CPU_HOST = 83, /* support for -cpu host */ - QEMU_CAPS_FSDEV_WRITEOUT = 84, /* -fsdev writeout supported */ - QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends */ - QEMU_CAPS_WAKEUP = 86, /* system_wakeup monitor command */ - QEMU_CAPS_SCSI_DISK_CHANNEL = 87, /* Is scsi-disk.channel available? */ - QEMU_CAPS_SCSI_BLOCK = 88, /* -device scsi-block */ - QEMU_CAPS_TRANSACTION = 89, /* transaction monitor command */ - QEMU_CAPS_BLOCKJOB_SYNC = 90, /* old block_job_cancel, block_stream */ - QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* new block-job-cancel, block-stream */ - QEMU_CAPS_SCSI_CD = 92, /* -device scsi-cd */ - QEMU_CAPS_IDE_CD = 93, /* -device ide-cd */ - QEMU_CAPS_NO_USER_CONFIG = 94, /* -no-user-config */ - QEMU_CAPS_HDA_MICRO = 95, /* -device hda-micro */ - QEMU_CAPS_DUMP_GUEST_MEMORY = 96, /* dump-guest-memory command */ - QEMU_CAPS_NEC_USB_XHCI = 97, /* -device nec-usb-xhci */ - QEMU_CAPS_VIRTIO_S390 = 98, /* -device virtio-*-s390 */ - QEMU_CAPS_BALLOON_EVENT = 99, /* Async event for balloon changes */ - QEMU_CAPS_NETDEV_BRIDGE = 100, /* bridge helper support */ - QEMU_CAPS_SCSI_LSI = 101, /* -device lsi */ - QEMU_CAPS_VIRTIO_SCSI = 102, /* -device virtio-scsi-* */ - QEMU_CAPS_BLOCKIO = 103, /* -device ...logical_block_size & co */ - QEMU_CAPS_DISABLE_S3 = 104, /* S3 BIOS Advertisement on/off */ - QEMU_CAPS_DISABLE_S4 = 105, /* S4 BIOS Advertisement on/off */ - QEMU_CAPS_USB_REDIR_FILTER = 106, /* usb-redir.filter */ - QEMU_CAPS_IDE_DRIVE_WWN = 107, /* Is ide-drive.wwn available? */ - QEMU_CAPS_SCSI_DISK_WWN = 108, /* Is scsi-disk.wwn available? */ - QEMU_CAPS_SECCOMP_SANDBOX = 109, /* -sandbox */ - QEMU_CAPS_REBOOT_TIMEOUT = 110, /* -boot reboot-timeout */ - QEMU_CAPS_DUMP_GUEST_CORE = 111, /* dump-guest-core-parameter */ - QEMU_CAPS_SEAMLESS_MIGRATION = 112, /* seamless-migration for SPICE */ - QEMU_CAPS_BLOCK_COMMIT = 113, /* block-commit */ - QEMU_CAPS_VNC = 114, /* Is -vnc available? */ - QEMU_CAPS_DRIVE_MIRROR = 115, /* drive-mirror monitor command */ - QEMU_CAPS_USB_REDIR_BOOTINDEX = 116, /* usb-redir.bootindex */ - QEMU_CAPS_USB_HOST_BOOTINDEX = 117, /* usb-host.bootindex */ - QEMU_CAPS_DISK_SNAPSHOT = 118, /* blockdev-snapshot-sync command */ - QEMU_CAPS_DEVICE_QXL = 119, /* -device qxl */ - QEMU_CAPS_DEVICE_VGA = 120, /* -device VGA */ - QEMU_CAPS_DEVICE_CIRRUS_VGA = 121, /* -device cirrus-vga */ - QEMU_CAPS_DEVICE_VMWARE_SVGA = 122, /* -device vmware-svga */ - QEMU_CAPS_DEVICE_VIDEO_PRIMARY = 123, /* safe to use -device XXX - for primary video device */ - QEMU_CAPS_SCLP_S390 = 124, /* -device sclp* */ - QEMU_CAPS_DEVICE_USB_SERIAL = 125, /* -device usb-serial */ - QEMU_CAPS_DEVICE_USB_NET = 126, /* -device usb-net */ - QEMU_CAPS_ADD_FD = 127, /* -add-fd */ - QEMU_CAPS_NBD_SERVER = 128, /* nbd-server-start QMP command */ - QEMU_CAPS_DEVICE_VIRTIO_RNG = 129, /* virtio-rng device */ - QEMU_CAPS_OBJECT_RNG_RANDOM = 130, /* the rng-random backend for - virtio rng */ - QEMU_CAPS_OBJECT_RNG_EGD = 131, /* EGD protocol daemon for rng */ - QEMU_CAPS_VIRTIO_CCW = 132, /* -device virtio-*-ccw */ - QEMU_CAPS_DTB = 133, /* -dtb file */ - QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ - QEMU_CAPS_IPV6_MIGRATION = 135, /* -incoming [::] */ - QEMU_CAPS_MACHINE_OPT = 136, /* -machine xxxx*/ - QEMU_CAPS_MACHINE_USB_OPT = 137, /* -machine xxx,usb=on/off */ - QEMU_CAPS_DEVICE_TPM_PASSTHROUGH = 138, /* -tpmdev passthrough */ - QEMU_CAPS_DEVICE_TPM_TIS = 139, /* -device tpm_tis */ - QEMU_CAPS_DEVICE_NVRAM = 140, /* -global spapr-nvram.reg=xxxx */ - QEMU_CAPS_DEVICE_PCI_BRIDGE = 141, /* -device pci-bridge */ - QEMU_CAPS_DEVICE_VFIO_PCI = 142, /* -device vfio-pci */ - QEMU_CAPS_VFIO_PCI_BOOTINDEX = 143, /* bootindex param for vfio-pci device */ - QEMU_CAPS_DEVICE_SCSI_GENERIC = 144, /* -device scsi-generic */ - QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX = 145, /* -device scsi-generic.bootindex */ - QEMU_CAPS_MEM_MERGE = 146, /* -machine mem-merge */ - QEMU_CAPS_VNC_WEBSOCKET = 147, /* -vnc x:y,websocket */ - QEMU_CAPS_DRIVE_DISCARD = 148, /* -drive discard=off(ignore)|on(unmap) */ - QEMU_CAPS_MLOCK = 149, /* -realtime mlock=on|off */ - QEMU_CAPS_VNC_SHARE_POLICY = 150, /* set display sharing policy */ - QEMU_CAPS_DEVICE_DEL_EVENT = 151, /* DEVICE_DELETED event */ - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE = 152, /* -device i82801b11-bridge */ - QEMU_CAPS_I440FX_PCI_HOLE64_SIZE = 153, /* i440FX-pcihost.pci-hole64-size */ - QEMU_CAPS_Q35_PCI_HOLE64_SIZE = 154, /* q35-pcihost.pci-hole64-size */ - QEMU_CAPS_DEVICE_USB_STORAGE = 155, /* -device usb-storage */ - QEMU_CAPS_USB_STORAGE_REMOVABLE = 156, /* usb-storage.removable */ - QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ - QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ - QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ - QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */ - QEMU_CAPS_DEVICE_PANIC = 161, /* -device pvpanic */ - QEMU_CAPS_ENABLE_FIPS = 162, /* -enable-fips */ - QEMU_CAPS_SPICE_FILE_XFER_DISABLE = 163, /* -spice disable-agent-file-xfer */ - QEMU_CAPS_CHARDEV_SPICEPORT = 164, /* -chardev spiceport */ - QEMU_CAPS_DEVICE_USB_KBD = 165, /* -device usb-kbd */ - QEMU_CAPS_HOST_PCI_MULTIDOMAIN = 166, /* support domain > 0 in host pci address */ - QEMU_CAPS_MSG_TIMESTAMP = 167, /* -msg timestamp */ - QEMU_CAPS_ACTIVE_COMMIT = 168, /* block-commit works without 'top' */ - QEMU_CAPS_CHANGE_BACKING_FILE = 169, /* change name of backing file in metadata */ - QEMU_CAPS_OBJECT_MEMORY_RAM = 170, /* -object memory-backend-ram */ - QEMU_CAPS_NUMA = 171, /* newer -numa handling with disjoint cpu ranges */ - QEMU_CAPS_OBJECT_MEMORY_FILE = 172, /* -object memory-backend-file */ - QEMU_CAPS_OBJECT_USB_AUDIO = 173, /* usb-audio device support */ - QEMU_CAPS_RTC_RESET_REINJECTION = 174, /* rtc-reset-reinjection monitor command */ - QEMU_CAPS_SPLASH_TIMEOUT = 175, /* -boot splash-time */ - QEMU_CAPS_OBJECT_IOTHREAD = 176, /* -object iothread */ - QEMU_CAPS_MIGRATE_RDMA = 177, /* have rdma migration */ - QEMU_CAPS_DEVICE_IVSHMEM = 178, /* -device ivshmem */ - QEMU_CAPS_DRIVE_IOTUNE_MAX = 179, /* -drive bps_max= and friends */ - QEMU_CAPS_VGA_VGAMEM = 180, /* -device VGA.vgamem_mb */ - QEMU_CAPS_VMWARE_SVGA_VGAMEM = 181, /* -device vmware-svga.vgamem_mb */ - QEMU_CAPS_QXL_VGAMEM = 182, /* -device qxl.vgamem_mb */ - QEMU_CAPS_QXL_VGA_VGAMEM = 183, /* -device qxl-vga.vgamem_mb */ - QEMU_CAPS_DEVICE_PC_DIMM = 184, /* pc-dimm device */ - QEMU_CAPS_MACHINE_VMPORT_OPT = 185, /* -machine xxx,vmport=on/off/auto */ - QEMU_CAPS_AES_KEY_WRAP = 186, /* -machine aes_key_wrap */ - QEMU_CAPS_DEA_KEY_WRAP = 187, /* -machine dea_key_wrap */ - QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ - QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ - QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ - QEMU_CAPS_MIGRATION_EVENT = 191, /* MIGRATION event */ - QEMU_CAPS_OBJECT_GPEX = 192, /* have generic PCI host controller */ - QEMU_CAPS_DEVICE_IOH3420 = 193, /* -device ioh3420 */ - QEMU_CAPS_DEVICE_X3130_UPSTREAM = 194, /* -device x3130-upstream */ - QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM = 195, /* -device xio3130-downstream */ - QEMU_CAPS_DEVICE_RTL8139 = 196, /* -device rtl8139 */ - QEMU_CAPS_DEVICE_E1000 = 197, /* -device e1000 */ - QEMU_CAPS_DEVICE_VIRTIO_NET = 198, /* -device virtio-net-* */ - QEMU_CAPS_MACH_VIRT_GIC_VERSION = 199, /* -machine virt,gic-version */ - - QEMU_CAPS_LAST, /* this must always be the last item */ + QEMU_CAPS_KQEMU, /* Whether KQEMU is compiled in */ + QEMU_CAPS_VNC_COLON, /* VNC takes or address + display */ + QEMU_CAPS_NO_REBOOT, /* Is the -no-reboot flag available */ + QEMU_CAPS_DRIVE, /* Is the new -drive arg available */ + QEMU_CAPS_DRIVE_BOOT, /* Does -drive support boot=on */ + QEMU_CAPS_NAME, /* Is the -name flag available */ + QEMU_CAPS_UUID, /* Is the -uuid flag available */ + QEMU_CAPS_DOMID, /* Xenner: -domid flag available */ + QEMU_CAPS_VNET_HDR, + QEMU_CAPS_MIGRATE_KVM_STDIO, /* avoid kvm tcp migration bug */ + QEMU_CAPS_MIGRATE_QEMU_TCP, /* have qemu tcp migration */ + QEMU_CAPS_MIGRATE_QEMU_EXEC, /* have qemu exec migration */ + QEMU_CAPS_DRIVE_CACHE_V2, /* cache= flag wanting new v2 values */ + QEMU_CAPS_KVM, /* Whether KVM is enabled by default */ + QEMU_CAPS_DRIVE_FORMAT, /* Is -drive format= avail */ + QEMU_CAPS_VGA, /* Is -vga avail */ + QEMU_CAPS_0_10, /* features added in qemu-0.10.0 or later */ + QEMU_CAPS_PCIDEVICE, /* PCI device assignment supported */ + QEMU_CAPS_MEM_PATH, /* mmap'ped guest backing supported */ + QEMU_CAPS_DRIVE_SERIAL, /* -driver serial= available */ + QEMU_CAPS_XEN_DOMID, /* -xen-domid */ + QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */ + QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */ + QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */ + QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */ + QEMU_CAPS_BALLOON, /* -balloon available */ + QEMU_CAPS_DEVICE, /* Is the new -device arg available */ + QEMU_CAPS_SDL, /* Is the new -sdl arg available */ + QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */ + QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */ + QEMU_CAPS_RTC, /* The -rtc flag for clock options */ + QEMU_CAPS_VHOST_NET, /* vhost-net support available */ + QEMU_CAPS_RTC_TD_HACK, /* -rtc-td-hack available */ + QEMU_CAPS_NO_HPET, /* -no-hpet flag is supported */ + QEMU_CAPS_NO_KVM_PIT, /* -no-kvm-pit-reinjection supported */ + QEMU_CAPS_TDF, /* -tdf flag (user-mode pit catchup) */ + QEMU_CAPS_PCI_CONFIGFD, /* pci-assign.configfd */ + QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */ + QEMU_CAPS_BOOT_MENU, /* -boot menu=on support */ + QEMU_CAPS_ENABLE_KQEMU, /* -enable-kqemu flag */ + QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */ + QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */ + QEMU_CAPS_NAME_PROCESS, /* Is -name process= available */ + QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */ + QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type= available */ + QEMU_CAPS_VGA_QXL, /* The 'qxl' arg for '-vga' */ + QEMU_CAPS_SPICE, /* Is -spice avail */ + QEMU_CAPS_VGA_NONE, /* The 'none' arg for '-vga' */ + QEMU_CAPS_MIGRATE_QEMU_FD, /* -incoming fd:n */ + QEMU_CAPS_BOOTINDEX, /* -device bootindex property */ + QEMU_CAPS_HDA_DUPLEX, /* -device hda-duplex */ + QEMU_CAPS_DRIVE_AIO, /* -drive aio= supported */ + QEMU_CAPS_PCI_MULTIBUS, /* bus=pci.0 vs bus=pci */ + QEMU_CAPS_PCI_BOOTINDEX, /* pci-assign.bootindex */ + QEMU_CAPS_CCID_EMULATED, /* -device ccid-card-emulated */ + QEMU_CAPS_CCID_PASSTHRU, /* -device ccid-card-passthru */ + QEMU_CAPS_CHARDEV_SPICEVMC, /* newer -chardev spicevmc */ + QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc*/ + QEMU_CAPS_VIRTIO_TX_ALG, /* -device virtio-net-pci,tx=string */ + QEMU_CAPS_DEVICE_QXL_VGA, /* primary qxl device named qxl-vga? */ + QEMU_CAPS_PCI_MULTIFUNCTION, /* -device multifunction=on|off */ + QEMU_CAPS_VIRTIO_IOEVENTFD, /* virtio-{net|blk}-pci.ioeventfd=on */ + QEMU_CAPS_SGA, /* Serial Graphics Adapter */ + QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, /* virtio-blk-pci.event_idx */ + QEMU_CAPS_VIRTIO_NET_EVENT_IDX, /* virtio-net-pci.event_idx */ + QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, /* Is cache=directsync supported? */ + QEMU_CAPS_PIIX3_USB_UHCI, /* -device piix3-usb-uhci */ + QEMU_CAPS_PIIX4_USB_UHCI, /* -device piix4-usb-uhci */ + QEMU_CAPS_USB_EHCI, /* -device usb-ehci */ + QEMU_CAPS_ICH9_USB_EHCI1, /* -device ich9-usb-ehci1 and friends */ + QEMU_CAPS_VT82C686B_USB_UHCI, /* -device vt82c686b-usb-uhci */ + QEMU_CAPS_PCI_OHCI, /* -device pci-ohci */ + QEMU_CAPS_USB_REDIR, /* -device usb-redir */ + QEMU_CAPS_USB_HUB, /* -device usb-hub */ + QEMU_CAPS_NO_SHUTDOWN, /* usable -no-shutdown */ + QEMU_CAPS_DRIVE_CACHE_UNSAFE, /* Is cache=unsafe supported? */ + QEMU_CAPS_PCI_ROMBAR, /* -device rombar=0|1 */ + QEMU_CAPS_ICH9_AHCI, /* -device ich9-ahci */ + QEMU_CAPS_NO_ACPI, /* -no-acpi */ + QEMU_CAPS_FSDEV_READONLY, /* -fsdev readonly supported */ + QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */ + QEMU_CAPS_VIRTIO_BLK_SG_IO, /* SG_IO commands, since 0.11 */ + QEMU_CAPS_DRIVE_COPY_ON_READ, /* -drive copy-on-read */ + QEMU_CAPS_CPU_HOST, /* support for -cpu host */ + QEMU_CAPS_FSDEV_WRITEOUT, /* -fsdev writeout supported */ + QEMU_CAPS_DRIVE_IOTUNE, /* -drive bps= and friends */ + QEMU_CAPS_WAKEUP, /* system_wakeup monitor command */ + QEMU_CAPS_SCSI_DISK_CHANNEL, /* Is scsi-disk.channel available? */ + QEMU_CAPS_SCSI_BLOCK, /* -device scsi-block */ + QEMU_CAPS_TRANSACTION, /* transaction monitor command */ + QEMU_CAPS_BLOCKJOB_SYNC, /* old block_job_cancel, block_stream */ + QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */ + QEMU_CAPS_SCSI_CD, /* -device scsi-cd */ + QEMU_CAPS_IDE_CD, /* -device ide-cd */ + QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */ + QEMU_CAPS_HDA_MICRO, /* -device hda-micro */ + QEMU_CAPS_DUMP_GUEST_MEMORY, /* dump-guest-memory command */ + QEMU_CAPS_NEC_USB_XHCI, /* -device nec-usb-xhci */ + QEMU_CAPS_VIRTIO_S390, /* -device virtio-*-s390 */ + QEMU_CAPS_BALLOON_EVENT, /* Async event for balloon changes */ + QEMU_CAPS_NETDEV_BRIDGE, /* bridge helper support */ + QEMU_CAPS_SCSI_LSI, /* -device lsi */ + QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */ + QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ + QEMU_CAPS_DISABLE_S3, /* S3 BIOS Advertisement on/off */ + QEMU_CAPS_DISABLE_S4, /* S4 BIOS Advertisement on/off */ + QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */ + QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */ + QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */ + QEMU_CAPS_SECCOMP_SANDBOX, /* -sandbox */ + QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */ + QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */ + QEMU_CAPS_SEAMLESS_MIGRATION, /* seamless-migration for SPICE */ + QEMU_CAPS_BLOCK_COMMIT, /* block-commit */ + QEMU_CAPS_VNC, /* Is -vnc available? */ + QEMU_CAPS_DRIVE_MIRROR, /* drive-mirror monitor command */ + QEMU_CAPS_USB_REDIR_BOOTINDEX, /* usb-redir.bootindex */ + QEMU_CAPS_USB_HOST_BOOTINDEX, /* usb-host.bootindex */ + QEMU_CAPS_DISK_SNAPSHOT, /* blockdev-snapshot-sync command */ + QEMU_CAPS_DEVICE_QXL, /* -device qxl */ + QEMU_CAPS_DEVICE_VGA, /* -device VGA */ + QEMU_CAPS_DEVICE_CIRRUS_VGA, /* -device cirrus-vga */ + QEMU_CAPS_DEVICE_VMWARE_SVGA, /* -device vmware-svga */ + QEMU_CAPS_DEVICE_VIDEO_PRIMARY, /* -device safe for primary video device */ + QEMU_CAPS_SCLP_S390, /* -device sclp* */ + QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */ + QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */ + QEMU_CAPS_ADD_FD, /* -add-fd */ + QEMU_CAPS_NBD_SERVER, /* nbd-server-start QMP command */ + QEMU_CAPS_DEVICE_VIRTIO_RNG, /* virtio-rng device */ + QEMU_CAPS_OBJECT_RNG_RANDOM, /* the rng-random backend for virtio rng */ + QEMU_CAPS_OBJECT_RNG_EGD, /* EGD protocol daemon for rng */ + QEMU_CAPS_VIRTIO_CCW, /* -device virtio-*-ccw */ + QEMU_CAPS_DTB, /* -dtb file */ + QEMU_CAPS_SCSI_MEGASAS, /* -device megasas */ + QEMU_CAPS_IPV6_MIGRATION, /* -incoming [::] */ + QEMU_CAPS_MACHINE_OPT, /* -machine xxxx*/ + QEMU_CAPS_MACHINE_USB_OPT, /* -machine xxx,usb=on/off */ + QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, /* -tpmdev passthrough */ + QEMU_CAPS_DEVICE_TPM_TIS, /* -device tpm_tis */ + QEMU_CAPS_DEVICE_NVRAM, /* -global spapr-nvram.reg=xxxx */ + QEMU_CAPS_DEVICE_PCI_BRIDGE, /* -device pci-bridge */ + QEMU_CAPS_DEVICE_VFIO_PCI, /* -device vfio-pci */ + QEMU_CAPS_VFIO_PCI_BOOTINDEX, /* bootindex param for vfio-pci device */ + QEMU_CAPS_DEVICE_SCSI_GENERIC, /* -device scsi-generic */ + QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, /* -device scsi-generic.bootindex */ + QEMU_CAPS_MEM_MERGE, /* -machine mem-merge */ + QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */ + QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=off(ignore)|on(unmap) */ + QEMU_CAPS_MLOCK, /* -realtime mlock=on|off */ + QEMU_CAPS_VNC_SHARE_POLICY, /* set display sharing policy */ + QEMU_CAPS_DEVICE_DEL_EVENT, /* DEVICE_DELETED event */ + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */ + QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */ + QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */ + QEMU_CAPS_DEVICE_USB_STORAGE, /* -device usb-storage */ + QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */ + QEMU_CAPS_DEVICE_VIRTIO_MMIO, /* -device virtio-mmio */ + QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, /* -device ich9-intel-hda */ + QEMU_CAPS_KVM_PIT_TICK_POLICY, /* kvm-pit.lost_tick_policy */ + QEMU_CAPS_BOOT_STRICT, /* -boot strict */ + QEMU_CAPS_DEVICE_PANIC, /* -device pvpanic */ + QEMU_CAPS_ENABLE_FIPS, /* -enable-fips */ + QEMU_CAPS_SPICE_FILE_XFER_DISABLE, /* -spice disable-agent-file-xfer */ + QEMU_CAPS_CHARDEV_SPICEPORT, /* -chardev spiceport */ + QEMU_CAPS_DEVICE_USB_KBD, /* -device usb-kbd */ + QEMU_CAPS_HOST_PCI_MULTIDOMAIN, /* support domain > 0 in host pci address */ + QEMU_CAPS_MSG_TIMESTAMP, /* -msg timestamp */ + QEMU_CAPS_ACTIVE_COMMIT, /* block-commit works without 'top' */ + QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metadata */ + QEMU_CAPS_OBJECT_MEMORY_RAM, /* -object memory-backend-ram */ + QEMU_CAPS_NUMA, /* newer -numa handling with disjoint cpu ranges */ + QEMU_CAPS_OBJECT_MEMORY_FILE, /* -object memory-backend-file */ + QEMU_CAPS_OBJECT_USB_AUDIO, /* usb-audio device support */ + QEMU_CAPS_RTC_RESET_REINJECTION, /* rtc-reset-reinjection monitor command */ + QEMU_CAPS_SPLASH_TIMEOUT, /* -boot splash-time */ + QEMU_CAPS_OBJECT_IOTHREAD, /* -object iothread */ + QEMU_CAPS_MIGRATE_RDMA, /* have rdma migration */ + QEMU_CAPS_DEVICE_IVSHMEM, /* -device ivshmem */ + QEMU_CAPS_DRIVE_IOTUNE_MAX, /* -drive bps_max= and friends */ + QEMU_CAPS_VGA_VGAMEM, /* -device VGA.vgamem_mb */ + QEMU_CAPS_VMWARE_SVGA_VGAMEM, /* -device vmware-svga.vgamem_mb */ + QEMU_CAPS_QXL_VGAMEM, /* -device qxl.vgamem_mb */ + QEMU_CAPS_QXL_VGA_VGAMEM, /* -device qxl-vga.vgamem_mb */ + QEMU_CAPS_DEVICE_PC_DIMM, /* pc-dimm device */ + QEMU_CAPS_MACHINE_VMPORT_OPT, /* -machine xxx,vmport=on/off/auto */ + QEMU_CAPS_AES_KEY_WRAP, /* -machine aes_key_wrap */ + QEMU_CAPS_DEA_KEY_WRAP, /* -machine dea_key_wrap */ + QEMU_CAPS_DEVICE_PCI_SERIAL, /* -device pci-serial */ + QEMU_CAPS_CPU_AARCH64_OFF, /* -cpu ...,aarch64=off */ + QEMU_CAPS_VHOSTUSER_MULTIQUEUE, /* vhost-user with -netdev queues= */ + QEMU_CAPS_MIGRATION_EVENT, /* MIGRATION event */ + QEMU_CAPS_OBJECT_GPEX, /* have generic PCI host controller */ + QEMU_CAPS_DEVICE_IOH3420, /* -device ioh3420 */ + QEMU_CAPS_DEVICE_X3130_UPSTREAM, /* -device x3130-upstream */ + QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, /* -device xio3130-downstream */ + QEMU_CAPS_DEVICE_RTL8139, /* -device rtl8139 */ + QEMU_CAPS_DEVICE_E1000, /* -device e1000 */ + QEMU_CAPS_DEVICE_VIRTIO_NET, /* -device virtio-net-* */ + QEMU_CAPS_MACH_VIRT_GIC_VERSION, /* -machine virt,gic-version */ + + QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; +/* Aliases for some of the capabilities defined above */ +#define QEMU_CAPS_NET_NAME QEMU_CAPS_0_10 /* -net ...,name=str */ +#define QEMU_CAPS_HOST_NET_ADD QEMU_CAPS_0_10 /* host_net_add command */ + typedef struct _virQEMUCaps virQEMUCaps; typedef virQEMUCaps *virQEMUCapsPtr; -- 2.4.3

3 5

[libvirt] [PATCH] qemu: Fix indentation issue
by Andrea Bolognani 07 Oct '15

07 Oct '15

Two #define lines introduced by b527aa0 did not respect the indentation rules, thus breaking syntax-check. --- Pushed as trivial. src/qemu/qemu_capabilities.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 7b0e3eb..b883315 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -316,8 +316,8 @@ typedef enum { } virQEMUCapsFlags; /* Aliases for some of the capabilities defined above */ -#define QEMU_CAPS_NET_NAME QEMU_CAPS_0_10 /* -net ...,name=str */ -#define QEMU_CAPS_HOST_NET_ADD QEMU_CAPS_0_10 /* host_net_add command */ +# define QEMU_CAPS_NET_NAME QEMU_CAPS_0_10 /* -net ...,name=str */ +# define QEMU_CAPS_HOST_NET_ADD QEMU_CAPS_0_10 /* host_net_add command */ typedef struct _virQEMUCaps virQEMUCaps; typedef virQEMUCaps *virQEMUCapsPtr; -- 2.4.3

1 0

[libvirt] [PATCH] qemu: Align virQEMUCapsFlags members
by Andrea Bolognani 07 Oct '15

07 Oct '15

--- This pushes a lot of lines well beyond 80 columns, but then again some of the entries were already as long as 92 columns... src/qemu/qemu_capabilities.h | 412 +++++++++++++++++++++---------------------- 1 file changed, 205 insertions(+), 207 deletions(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index a1d98d0..06c928c 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -32,215 +32,213 @@ /* Internal flags to keep track of qemu command line capabilities */ typedef enum { - QEMU_CAPS_KQEMU = 0, /* Whether KQEMU is compiled in */ - QEMU_CAPS_VNC_COLON = 1, /* VNC takes or address + display */ - QEMU_CAPS_NO_REBOOT = 2, /* Is the -no-reboot flag available */ - QEMU_CAPS_DRIVE = 3, /* Is the new -drive arg available */ - QEMU_CAPS_DRIVE_BOOT = 4, /* Does -drive support boot=on */ - QEMU_CAPS_NAME = 5, /* Is the -name flag available */ - QEMU_CAPS_UUID = 6, /* Is the -uuid flag available */ - QEMU_CAPS_DOMID = 7, /* Xenner: -domid flag available */ - QEMU_CAPS_VNET_HDR = 8, - QEMU_CAPS_MIGRATE_KVM_STDIO = 9, /* avoid kvm tcp migration bug */ - QEMU_CAPS_MIGRATE_QEMU_TCP = 10, /* have qemu tcp migration */ - QEMU_CAPS_MIGRATE_QEMU_EXEC = 11, /* have qemu exec migration */ - QEMU_CAPS_DRIVE_CACHE_V2 = 12, /* cache= flag wanting new v2 values */ - QEMU_CAPS_KVM = 13, /* Whether KVM is enabled by default */ - QEMU_CAPS_DRIVE_FORMAT = 14, /* Is -drive format= avail */ - QEMU_CAPS_VGA = 15, /* Is -vga avail */ + QEMU_CAPS_KQEMU = 0, /* Whether KQEMU is compiled in */ + QEMU_CAPS_VNC_COLON = 1, /* VNC takes or address + display */ + QEMU_CAPS_NO_REBOOT = 2, /* Is the -no-reboot flag available */ + QEMU_CAPS_DRIVE = 3, /* Is the new -drive arg available */ + QEMU_CAPS_DRIVE_BOOT = 4, /* Does -drive support boot=on */ + QEMU_CAPS_NAME = 5, /* Is the -name flag available */ + QEMU_CAPS_UUID = 6, /* Is the -uuid flag available */ + QEMU_CAPS_DOMID = 7, /* Xenner: -domid flag available */ + QEMU_CAPS_VNET_HDR = 8, + QEMU_CAPS_MIGRATE_KVM_STDIO = 9, /* avoid kvm tcp migration bug */ + QEMU_CAPS_MIGRATE_QEMU_TCP = 10, /* have qemu tcp migration */ + QEMU_CAPS_MIGRATE_QEMU_EXEC = 11, /* have qemu exec migration */ + QEMU_CAPS_DRIVE_CACHE_V2 = 12, /* cache= flag wanting new v2 values */ + QEMU_CAPS_KVM = 13, /* Whether KVM is enabled by default */ + QEMU_CAPS_DRIVE_FORMAT = 14, /* Is -drive format= avail */ + QEMU_CAPS_VGA = 15, /* Is -vga avail */ /* features added in qemu-0.10.0 or later */ - QEMU_CAPS_0_10 = 16, - QEMU_CAPS_NET_NAME = QEMU_CAPS_0_10, /* -net ...,name=str */ - QEMU_CAPS_HOST_NET_ADD = QEMU_CAPS_0_10, /* host_net_add command */ - - QEMU_CAPS_PCIDEVICE = 17, /* PCI device assignment supported */ - QEMU_CAPS_MEM_PATH = 18, /* mmap'ped guest backing supported */ - QEMU_CAPS_DRIVE_SERIAL = 19, /* -driver serial= available */ - QEMU_CAPS_XEN_DOMID = 20, /* -xen-domid */ - QEMU_CAPS_MIGRATE_QEMU_UNIX = 21, /* qemu migration via unix sockets */ - QEMU_CAPS_CHARDEV = 22, /* Is the new -chardev arg available */ - QEMU_CAPS_ENABLE_KVM = 23, /* -enable-kvm flag */ - QEMU_CAPS_MONITOR_JSON = 24, /* JSON mode for monitor */ - QEMU_CAPS_BALLOON = 25, /* -balloon available */ - QEMU_CAPS_DEVICE = 26, /* Is the new -device arg available */ - QEMU_CAPS_SDL = 27, /* Is the new -sdl arg available */ - QEMU_CAPS_SMP_TOPOLOGY = 28, /* -smp has sockets/cores/threads */ - QEMU_CAPS_NETDEV = 29, /* -netdev flag & netdev_add/remove */ - QEMU_CAPS_RTC = 30, /* The -rtc flag for clock options */ - QEMU_CAPS_VHOST_NET = 31, /* vhost-net support available */ - QEMU_CAPS_RTC_TD_HACK = 32, /* -rtc-td-hack available */ - QEMU_CAPS_NO_HPET = 33, /* -no-hpet flag is supported */ - QEMU_CAPS_NO_KVM_PIT = 34, /* -no-kvm-pit-reinjection supported */ - QEMU_CAPS_TDF = 35, /* -tdf flag (user-mode pit catchup) */ - QEMU_CAPS_PCI_CONFIGFD = 36, /* pci-assign.configfd */ - QEMU_CAPS_NODEFCONFIG = 37, /* -nodefconfig */ - QEMU_CAPS_BOOT_MENU = 38, /* -boot menu=on support */ - QEMU_CAPS_ENABLE_KQEMU = 39, /* -enable-kqemu flag */ - QEMU_CAPS_FSDEV = 40, /* -fstype filesystem passthrough */ - QEMU_CAPS_NESTING = 41, /* -enable-nesting (SVM/VMX) */ - QEMU_CAPS_NAME_PROCESS = 42, /* Is -name process= available */ - QEMU_CAPS_DRIVE_READONLY = 43, /* -drive readonly=on|off */ - QEMU_CAPS_SMBIOS_TYPE = 44, /* Is -smbios type= available */ - QEMU_CAPS_VGA_QXL = 45, /* The 'qxl' arg for '-vga' */ - QEMU_CAPS_SPICE = 46, /* Is -spice avail */ - QEMU_CAPS_VGA_NONE = 47, /* The 'none' arg for '-vga' */ - QEMU_CAPS_MIGRATE_QEMU_FD = 48, /* -incoming fd:n */ - QEMU_CAPS_BOOTINDEX = 49, /* -device bootindex property */ - QEMU_CAPS_HDA_DUPLEX = 50, /* -device hda-duplex */ - QEMU_CAPS_DRIVE_AIO = 51, /* -drive aio= supported */ - QEMU_CAPS_PCI_MULTIBUS = 52, /* bus=pci.0 vs bus=pci */ - QEMU_CAPS_PCI_BOOTINDEX = 53, /* pci-assign.bootindex */ - QEMU_CAPS_CCID_EMULATED = 54, /* -device ccid-card-emulated */ - QEMU_CAPS_CCID_PASSTHRU = 55, /* -device ccid-card-passthru */ - QEMU_CAPS_CHARDEV_SPICEVMC = 56, /* newer -chardev spicevmc */ - QEMU_CAPS_DEVICE_SPICEVMC = 57, /* older -device spicevmc*/ - QEMU_CAPS_VIRTIO_TX_ALG = 58, /* -device virtio-net-pci,tx=string */ - QEMU_CAPS_DEVICE_QXL_VGA = 59, /* primary qxl device named qxl-vga? */ - QEMU_CAPS_PCI_MULTIFUNCTION = 60, /* -device multifunction=on|off */ - QEMU_CAPS_VIRTIO_IOEVENTFD = 61, /* virtio-{net|blk}-pci.ioeventfd=on */ - QEMU_CAPS_SGA = 62, /* Serial Graphics Adapter */ - QEMU_CAPS_VIRTIO_BLK_EVENT_IDX = 63, /* virtio-blk-pci.event_idx */ - QEMU_CAPS_VIRTIO_NET_EVENT_IDX = 64, /* virtio-net-pci.event_idx */ - QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC = 65, /* Is cache=directsync supported? */ - QEMU_CAPS_PIIX3_USB_UHCI = 66, /* -device piix3-usb-uhci */ - QEMU_CAPS_PIIX4_USB_UHCI = 67, /* -device piix4-usb-uhci */ - QEMU_CAPS_USB_EHCI = 68, /* -device usb-ehci */ - QEMU_CAPS_ICH9_USB_EHCI1 = 69, /* -device ich9-usb-ehci1 and friends */ - QEMU_CAPS_VT82C686B_USB_UHCI = 70, /* -device vt82c686b-usb-uhci */ - QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ - QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ - QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ - QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ - QEMU_CAPS_DRIVE_CACHE_UNSAFE = 75, /* Is cache=unsafe supported? */ - QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */ - QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ - QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ - QEMU_CAPS_FSDEV_READONLY = 79, /* -fsdev readonly supported */ - QEMU_CAPS_VIRTIO_BLK_SCSI = 80, /* virtio-blk-pci.scsi */ - QEMU_CAPS_VIRTIO_BLK_SG_IO = 81, /* SG_IO commands, since 0.11 */ - QEMU_CAPS_DRIVE_COPY_ON_READ = 82, /* -drive copy-on-read */ - QEMU_CAPS_CPU_HOST = 83, /* support for -cpu host */ - QEMU_CAPS_FSDEV_WRITEOUT = 84, /* -fsdev writeout supported */ - QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends */ - QEMU_CAPS_WAKEUP = 86, /* system_wakeup monitor command */ - QEMU_CAPS_SCSI_DISK_CHANNEL = 87, /* Is scsi-disk.channel available? */ - QEMU_CAPS_SCSI_BLOCK = 88, /* -device scsi-block */ - QEMU_CAPS_TRANSACTION = 89, /* transaction monitor command */ - QEMU_CAPS_BLOCKJOB_SYNC = 90, /* old block_job_cancel, block_stream */ - QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* new block-job-cancel, block-stream */ - QEMU_CAPS_SCSI_CD = 92, /* -device scsi-cd */ - QEMU_CAPS_IDE_CD = 93, /* -device ide-cd */ - QEMU_CAPS_NO_USER_CONFIG = 94, /* -no-user-config */ - QEMU_CAPS_HDA_MICRO = 95, /* -device hda-micro */ - QEMU_CAPS_DUMP_GUEST_MEMORY = 96, /* dump-guest-memory command */ - QEMU_CAPS_NEC_USB_XHCI = 97, /* -device nec-usb-xhci */ - QEMU_CAPS_VIRTIO_S390 = 98, /* -device virtio-*-s390 */ - QEMU_CAPS_BALLOON_EVENT = 99, /* Async event for balloon changes */ - QEMU_CAPS_NETDEV_BRIDGE = 100, /* bridge helper support */ - QEMU_CAPS_SCSI_LSI = 101, /* -device lsi */ - QEMU_CAPS_VIRTIO_SCSI = 102, /* -device virtio-scsi-* */ - QEMU_CAPS_BLOCKIO = 103, /* -device ...logical_block_size & co */ - QEMU_CAPS_DISABLE_S3 = 104, /* S3 BIOS Advertisement on/off */ - QEMU_CAPS_DISABLE_S4 = 105, /* S4 BIOS Advertisement on/off */ - QEMU_CAPS_USB_REDIR_FILTER = 106, /* usb-redir.filter */ - QEMU_CAPS_IDE_DRIVE_WWN = 107, /* Is ide-drive.wwn available? */ - QEMU_CAPS_SCSI_DISK_WWN = 108, /* Is scsi-disk.wwn available? */ - QEMU_CAPS_SECCOMP_SANDBOX = 109, /* -sandbox */ - QEMU_CAPS_REBOOT_TIMEOUT = 110, /* -boot reboot-timeout */ - QEMU_CAPS_DUMP_GUEST_CORE = 111, /* dump-guest-core-parameter */ - QEMU_CAPS_SEAMLESS_MIGRATION = 112, /* seamless-migration for SPICE */ - QEMU_CAPS_BLOCK_COMMIT = 113, /* block-commit */ - QEMU_CAPS_VNC = 114, /* Is -vnc available? */ - QEMU_CAPS_DRIVE_MIRROR = 115, /* drive-mirror monitor command */ - QEMU_CAPS_USB_REDIR_BOOTINDEX = 116, /* usb-redir.bootindex */ - QEMU_CAPS_USB_HOST_BOOTINDEX = 117, /* usb-host.bootindex */ - QEMU_CAPS_DISK_SNAPSHOT = 118, /* blockdev-snapshot-sync command */ - QEMU_CAPS_DEVICE_QXL = 119, /* -device qxl */ - QEMU_CAPS_DEVICE_VGA = 120, /* -device VGA */ - QEMU_CAPS_DEVICE_CIRRUS_VGA = 121, /* -device cirrus-vga */ - QEMU_CAPS_DEVICE_VMWARE_SVGA = 122, /* -device vmware-svga */ - QEMU_CAPS_DEVICE_VIDEO_PRIMARY = 123, /* safe to use -device XXX - for primary video device */ - QEMU_CAPS_SCLP_S390 = 124, /* -device sclp* */ - QEMU_CAPS_DEVICE_USB_SERIAL = 125, /* -device usb-serial */ - QEMU_CAPS_DEVICE_USB_NET = 126, /* -device usb-net */ - QEMU_CAPS_ADD_FD = 127, /* -add-fd */ - QEMU_CAPS_NBD_SERVER = 128, /* nbd-server-start QMP command */ - QEMU_CAPS_DEVICE_VIRTIO_RNG = 129, /* virtio-rng device */ - QEMU_CAPS_OBJECT_RNG_RANDOM = 130, /* the rng-random backend for - virtio rng */ - QEMU_CAPS_OBJECT_RNG_EGD = 131, /* EGD protocol daemon for rng */ - QEMU_CAPS_VIRTIO_CCW = 132, /* -device virtio-*-ccw */ - QEMU_CAPS_DTB = 133, /* -dtb file */ - QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ - QEMU_CAPS_IPV6_MIGRATION = 135, /* -incoming [::] */ - QEMU_CAPS_MACHINE_OPT = 136, /* -machine xxxx*/ - QEMU_CAPS_MACHINE_USB_OPT = 137, /* -machine xxx,usb=on/off */ - QEMU_CAPS_DEVICE_TPM_PASSTHROUGH = 138, /* -tpmdev passthrough */ - QEMU_CAPS_DEVICE_TPM_TIS = 139, /* -device tpm_tis */ - QEMU_CAPS_DEVICE_NVRAM = 140, /* -global spapr-nvram.reg=xxxx */ - QEMU_CAPS_DEVICE_PCI_BRIDGE = 141, /* -device pci-bridge */ - QEMU_CAPS_DEVICE_VFIO_PCI = 142, /* -device vfio-pci */ - QEMU_CAPS_VFIO_PCI_BOOTINDEX = 143, /* bootindex param for vfio-pci device */ - QEMU_CAPS_DEVICE_SCSI_GENERIC = 144, /* -device scsi-generic */ - QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX = 145, /* -device scsi-generic.bootindex */ - QEMU_CAPS_MEM_MERGE = 146, /* -machine mem-merge */ - QEMU_CAPS_VNC_WEBSOCKET = 147, /* -vnc x:y,websocket */ - QEMU_CAPS_DRIVE_DISCARD = 148, /* -drive discard=off(ignore)|on(unmap) */ - QEMU_CAPS_MLOCK = 149, /* -realtime mlock=on|off */ - QEMU_CAPS_VNC_SHARE_POLICY = 150, /* set display sharing policy */ - QEMU_CAPS_DEVICE_DEL_EVENT = 151, /* DEVICE_DELETED event */ - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE = 152, /* -device i82801b11-bridge */ - QEMU_CAPS_I440FX_PCI_HOLE64_SIZE = 153, /* i440FX-pcihost.pci-hole64-size */ - QEMU_CAPS_Q35_PCI_HOLE64_SIZE = 154, /* q35-pcihost.pci-hole64-size */ - QEMU_CAPS_DEVICE_USB_STORAGE = 155, /* -device usb-storage */ - QEMU_CAPS_USB_STORAGE_REMOVABLE = 156, /* usb-storage.removable */ - QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ - QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ - QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ - QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */ - QEMU_CAPS_DEVICE_PANIC = 161, /* -device pvpanic */ - QEMU_CAPS_ENABLE_FIPS = 162, /* -enable-fips */ - QEMU_CAPS_SPICE_FILE_XFER_DISABLE = 163, /* -spice disable-agent-file-xfer */ - QEMU_CAPS_CHARDEV_SPICEPORT = 164, /* -chardev spiceport */ - QEMU_CAPS_DEVICE_USB_KBD = 165, /* -device usb-kbd */ - QEMU_CAPS_HOST_PCI_MULTIDOMAIN = 166, /* support domain > 0 in host pci address */ - QEMU_CAPS_MSG_TIMESTAMP = 167, /* -msg timestamp */ - QEMU_CAPS_ACTIVE_COMMIT = 168, /* block-commit works without 'top' */ - QEMU_CAPS_CHANGE_BACKING_FILE = 169, /* change name of backing file in metadata */ - QEMU_CAPS_OBJECT_MEMORY_RAM = 170, /* -object memory-backend-ram */ - QEMU_CAPS_NUMA = 171, /* newer -numa handling with disjoint cpu ranges */ - QEMU_CAPS_OBJECT_MEMORY_FILE = 172, /* -object memory-backend-file */ - QEMU_CAPS_OBJECT_USB_AUDIO = 173, /* usb-audio device support */ - QEMU_CAPS_RTC_RESET_REINJECTION = 174, /* rtc-reset-reinjection monitor command */ - QEMU_CAPS_SPLASH_TIMEOUT = 175, /* -boot splash-time */ - QEMU_CAPS_OBJECT_IOTHREAD = 176, /* -object iothread */ - QEMU_CAPS_MIGRATE_RDMA = 177, /* have rdma migration */ - QEMU_CAPS_DEVICE_IVSHMEM = 178, /* -device ivshmem */ - QEMU_CAPS_DRIVE_IOTUNE_MAX = 179, /* -drive bps_max= and friends */ - QEMU_CAPS_VGA_VGAMEM = 180, /* -device VGA.vgamem_mb */ - QEMU_CAPS_VMWARE_SVGA_VGAMEM = 181, /* -device vmware-svga.vgamem_mb */ - QEMU_CAPS_QXL_VGAMEM = 182, /* -device qxl.vgamem_mb */ - QEMU_CAPS_QXL_VGA_VGAMEM = 183, /* -device qxl-vga.vgamem_mb */ - QEMU_CAPS_DEVICE_PC_DIMM = 184, /* pc-dimm device */ - QEMU_CAPS_MACHINE_VMPORT_OPT = 185, /* -machine xxx,vmport=on/off/auto */ - QEMU_CAPS_AES_KEY_WRAP = 186, /* -machine aes_key_wrap */ - QEMU_CAPS_DEA_KEY_WRAP = 187, /* -machine dea_key_wrap */ - QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ - QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ - QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ - QEMU_CAPS_MIGRATION_EVENT = 191, /* MIGRATION event */ - QEMU_CAPS_OBJECT_GPEX = 192, /* have generic PCI host controller */ - QEMU_CAPS_DEVICE_IOH3420 = 193, /* -device ioh3420 */ - QEMU_CAPS_DEVICE_X3130_UPSTREAM = 194, /* -device x3130-upstream */ - QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM = 195, /* -device xio3130-downstream */ - QEMU_CAPS_DEVICE_RTL8139 = 196, /* -device rtl8139 */ - QEMU_CAPS_DEVICE_E1000 = 197, /* -device e1000 */ - QEMU_CAPS_DEVICE_VIRTIO_NET = 198, /* -device virtio-net-* */ - QEMU_CAPS_MACH_VIRT_GIC_VERSION = 199, /* -machine virt,gic-version */ - - QEMU_CAPS_LAST, /* this must always be the last item */ + QEMU_CAPS_0_10 = 16, + QEMU_CAPS_NET_NAME = QEMU_CAPS_0_10, /* -net ...,name=str */ + QEMU_CAPS_HOST_NET_ADD = QEMU_CAPS_0_10, /* host_net_add command */ + + QEMU_CAPS_PCIDEVICE = 17, /* PCI device assignment supported */ + QEMU_CAPS_MEM_PATH = 18, /* mmap'ped guest backing supported */ + QEMU_CAPS_DRIVE_SERIAL = 19, /* -driver serial= available */ + QEMU_CAPS_XEN_DOMID = 20, /* -xen-domid */ + QEMU_CAPS_MIGRATE_QEMU_UNIX = 21, /* qemu migration via unix sockets */ + QEMU_CAPS_CHARDEV = 22, /* Is the new -chardev arg available */ + QEMU_CAPS_ENABLE_KVM = 23, /* -enable-kvm flag */ + QEMU_CAPS_MONITOR_JSON = 24, /* JSON mode for monitor */ + QEMU_CAPS_BALLOON = 25, /* -balloon available */ + QEMU_CAPS_DEVICE = 26, /* Is the new -device arg available */ + QEMU_CAPS_SDL = 27, /* Is the new -sdl arg available */ + QEMU_CAPS_SMP_TOPOLOGY = 28, /* -smp has sockets/cores/threads */ + QEMU_CAPS_NETDEV = 29, /* -netdev flag & netdev_add/remove */ + QEMU_CAPS_RTC = 30, /* The -rtc flag for clock options */ + QEMU_CAPS_VHOST_NET = 31, /* vhost-net support available */ + QEMU_CAPS_RTC_TD_HACK = 32, /* -rtc-td-hack available */ + QEMU_CAPS_NO_HPET = 33, /* -no-hpet flag is supported */ + QEMU_CAPS_NO_KVM_PIT = 34, /* -no-kvm-pit-reinjection supported */ + QEMU_CAPS_TDF = 35, /* -tdf flag (user-mode pit catchup) */ + QEMU_CAPS_PCI_CONFIGFD = 36, /* pci-assign.configfd */ + QEMU_CAPS_NODEFCONFIG = 37, /* -nodefconfig */ + QEMU_CAPS_BOOT_MENU = 38, /* -boot menu=on support */ + QEMU_CAPS_ENABLE_KQEMU = 39, /* -enable-kqemu flag */ + QEMU_CAPS_FSDEV = 40, /* -fstype filesystem passthrough */ + QEMU_CAPS_NESTING = 41, /* -enable-nesting (SVM/VMX) */ + QEMU_CAPS_NAME_PROCESS = 42, /* Is -name process= available */ + QEMU_CAPS_DRIVE_READONLY = 43, /* -drive readonly=on|off */ + QEMU_CAPS_SMBIOS_TYPE = 44, /* Is -smbios type= available */ + QEMU_CAPS_VGA_QXL = 45, /* The 'qxl' arg for '-vga' */ + QEMU_CAPS_SPICE = 46, /* Is -spice avail */ + QEMU_CAPS_VGA_NONE = 47, /* The 'none' arg for '-vga' */ + QEMU_CAPS_MIGRATE_QEMU_FD = 48, /* -incoming fd:n */ + QEMU_CAPS_BOOTINDEX = 49, /* -device bootindex property */ + QEMU_CAPS_HDA_DUPLEX = 50, /* -device hda-duplex */ + QEMU_CAPS_DRIVE_AIO = 51, /* -drive aio= supported */ + QEMU_CAPS_PCI_MULTIBUS = 52, /* bus=pci.0 vs bus=pci */ + QEMU_CAPS_PCI_BOOTINDEX = 53, /* pci-assign.bootindex */ + QEMU_CAPS_CCID_EMULATED = 54, /* -device ccid-card-emulated */ + QEMU_CAPS_CCID_PASSTHRU = 55, /* -device ccid-card-passthru */ + QEMU_CAPS_CHARDEV_SPICEVMC = 56, /* newer -chardev spicevmc */ + QEMU_CAPS_DEVICE_SPICEVMC = 57, /* older -device spicevmc*/ + QEMU_CAPS_VIRTIO_TX_ALG = 58, /* -device virtio-net-pci,tx=string */ + QEMU_CAPS_DEVICE_QXL_VGA = 59, /* primary qxl device named qxl-vga? */ + QEMU_CAPS_PCI_MULTIFUNCTION = 60, /* -device multifunction=on|off */ + QEMU_CAPS_VIRTIO_IOEVENTFD = 61, /* virtio-{net|blk}-pci.ioeventfd=on */ + QEMU_CAPS_SGA = 62, /* Serial Graphics Adapter */ + QEMU_CAPS_VIRTIO_BLK_EVENT_IDX = 63, /* virtio-blk-pci.event_idx */ + QEMU_CAPS_VIRTIO_NET_EVENT_IDX = 64, /* virtio-net-pci.event_idx */ + QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC = 65, /* Is cache=directsync supported? */ + QEMU_CAPS_PIIX3_USB_UHCI = 66, /* -device piix3-usb-uhci */ + QEMU_CAPS_PIIX4_USB_UHCI = 67, /* -device piix4-usb-uhci */ + QEMU_CAPS_USB_EHCI = 68, /* -device usb-ehci */ + QEMU_CAPS_ICH9_USB_EHCI1 = 69, /* -device ich9-usb-ehci1 and friends */ + QEMU_CAPS_VT82C686B_USB_UHCI = 70, /* -device vt82c686b-usb-uhci */ + QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ + QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ + QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ + QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ + QEMU_CAPS_DRIVE_CACHE_UNSAFE = 75, /* Is cache=unsafe supported? */ + QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */ + QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ + QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ + QEMU_CAPS_FSDEV_READONLY = 79, /* -fsdev readonly supported */ + QEMU_CAPS_VIRTIO_BLK_SCSI = 80, /* virtio-blk-pci.scsi */ + QEMU_CAPS_VIRTIO_BLK_SG_IO = 81, /* SG_IO commands, since 0.11 */ + QEMU_CAPS_DRIVE_COPY_ON_READ = 82, /* -drive copy-on-read */ + QEMU_CAPS_CPU_HOST = 83, /* support for -cpu host */ + QEMU_CAPS_FSDEV_WRITEOUT = 84, /* -fsdev writeout supported */ + QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends */ + QEMU_CAPS_WAKEUP = 86, /* system_wakeup monitor command */ + QEMU_CAPS_SCSI_DISK_CHANNEL = 87, /* Is scsi-disk.channel available? */ + QEMU_CAPS_SCSI_BLOCK = 88, /* -device scsi-block */ + QEMU_CAPS_TRANSACTION = 89, /* transaction monitor command */ + QEMU_CAPS_BLOCKJOB_SYNC = 90, /* old block_job_cancel, block_stream */ + QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* new block-job-cancel, block-stream */ + QEMU_CAPS_SCSI_CD = 92, /* -device scsi-cd */ + QEMU_CAPS_IDE_CD = 93, /* -device ide-cd */ + QEMU_CAPS_NO_USER_CONFIG = 94, /* -no-user-config */ + QEMU_CAPS_HDA_MICRO = 95, /* -device hda-micro */ + QEMU_CAPS_DUMP_GUEST_MEMORY = 96, /* dump-guest-memory command */ + QEMU_CAPS_NEC_USB_XHCI = 97, /* -device nec-usb-xhci */ + QEMU_CAPS_VIRTIO_S390 = 98, /* -device virtio-*-s390 */ + QEMU_CAPS_BALLOON_EVENT = 99, /* Async event for balloon changes */ + QEMU_CAPS_NETDEV_BRIDGE = 100, /* bridge helper support */ + QEMU_CAPS_SCSI_LSI = 101, /* -device lsi */ + QEMU_CAPS_VIRTIO_SCSI = 102, /* -device virtio-scsi-* */ + QEMU_CAPS_BLOCKIO = 103, /* -device ...logical_block_size & co */ + QEMU_CAPS_DISABLE_S3 = 104, /* S3 BIOS Advertisement on/off */ + QEMU_CAPS_DISABLE_S4 = 105, /* S4 BIOS Advertisement on/off */ + QEMU_CAPS_USB_REDIR_FILTER = 106, /* usb-redir.filter */ + QEMU_CAPS_IDE_DRIVE_WWN = 107, /* Is ide-drive.wwn available? */ + QEMU_CAPS_SCSI_DISK_WWN = 108, /* Is scsi-disk.wwn available? */ + QEMU_CAPS_SECCOMP_SANDBOX = 109, /* -sandbox */ + QEMU_CAPS_REBOOT_TIMEOUT = 110, /* -boot reboot-timeout */ + QEMU_CAPS_DUMP_GUEST_CORE = 111, /* dump-guest-core-parameter */ + QEMU_CAPS_SEAMLESS_MIGRATION = 112, /* seamless-migration for SPICE */ + QEMU_CAPS_BLOCK_COMMIT = 113, /* block-commit */ + QEMU_CAPS_VNC = 114, /* Is -vnc available? */ + QEMU_CAPS_DRIVE_MIRROR = 115, /* drive-mirror monitor command */ + QEMU_CAPS_USB_REDIR_BOOTINDEX = 116, /* usb-redir.bootindex */ + QEMU_CAPS_USB_HOST_BOOTINDEX = 117, /* usb-host.bootindex */ + QEMU_CAPS_DISK_SNAPSHOT = 118, /* blockdev-snapshot-sync command */ + QEMU_CAPS_DEVICE_QXL = 119, /* -device qxl */ + QEMU_CAPS_DEVICE_VGA = 120, /* -device VGA */ + QEMU_CAPS_DEVICE_CIRRUS_VGA = 121, /* -device cirrus-vga */ + QEMU_CAPS_DEVICE_VMWARE_SVGA = 122, /* -device vmware-svga */ + QEMU_CAPS_DEVICE_VIDEO_PRIMARY = 123, /* safe to use -device for primary video device */ + QEMU_CAPS_SCLP_S390 = 124, /* -device sclp* */ + QEMU_CAPS_DEVICE_USB_SERIAL = 125, /* -device usb-serial */ + QEMU_CAPS_DEVICE_USB_NET = 126, /* -device usb-net */ + QEMU_CAPS_ADD_FD = 127, /* -add-fd */ + QEMU_CAPS_NBD_SERVER = 128, /* nbd-server-start QMP command */ + QEMU_CAPS_DEVICE_VIRTIO_RNG = 129, /* virtio-rng device */ + QEMU_CAPS_OBJECT_RNG_RANDOM = 130, /* the rng-random backend for virtio rng */ + QEMU_CAPS_OBJECT_RNG_EGD = 131, /* EGD protocol daemon for rng */ + QEMU_CAPS_VIRTIO_CCW = 132, /* -device virtio-*-ccw */ + QEMU_CAPS_DTB = 133, /* -dtb file */ + QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ + QEMU_CAPS_IPV6_MIGRATION = 135, /* -incoming [::] */ + QEMU_CAPS_MACHINE_OPT = 136, /* -machine xxxx*/ + QEMU_CAPS_MACHINE_USB_OPT = 137, /* -machine xxx,usb=on/off */ + QEMU_CAPS_DEVICE_TPM_PASSTHROUGH = 138, /* -tpmdev passthrough */ + QEMU_CAPS_DEVICE_TPM_TIS = 139, /* -device tpm_tis */ + QEMU_CAPS_DEVICE_NVRAM = 140, /* -global spapr-nvram.reg=xxxx */ + QEMU_CAPS_DEVICE_PCI_BRIDGE = 141, /* -device pci-bridge */ + QEMU_CAPS_DEVICE_VFIO_PCI = 142, /* -device vfio-pci */ + QEMU_CAPS_VFIO_PCI_BOOTINDEX = 143, /* bootindex param for vfio-pci device */ + QEMU_CAPS_DEVICE_SCSI_GENERIC = 144, /* -device scsi-generic */ + QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX = 145, /* -device scsi-generic.bootindex */ + QEMU_CAPS_MEM_MERGE = 146, /* -machine mem-merge */ + QEMU_CAPS_VNC_WEBSOCKET = 147, /* -vnc x:y,websocket */ + QEMU_CAPS_DRIVE_DISCARD = 148, /* -drive discard=off(ignore)|on(unmap) */ + QEMU_CAPS_MLOCK = 149, /* -realtime mlock=on|off */ + QEMU_CAPS_VNC_SHARE_POLICY = 150, /* set display sharing policy */ + QEMU_CAPS_DEVICE_DEL_EVENT = 151, /* DEVICE_DELETED event */ + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE = 152, /* -device i82801b11-bridge */ + QEMU_CAPS_I440FX_PCI_HOLE64_SIZE = 153, /* i440FX-pcihost.pci-hole64-size */ + QEMU_CAPS_Q35_PCI_HOLE64_SIZE = 154, /* q35-pcihost.pci-hole64-size */ + QEMU_CAPS_DEVICE_USB_STORAGE = 155, /* -device usb-storage */ + QEMU_CAPS_USB_STORAGE_REMOVABLE = 156, /* usb-storage.removable */ + QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ + QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ + QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ + QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */ + QEMU_CAPS_DEVICE_PANIC = 161, /* -device pvpanic */ + QEMU_CAPS_ENABLE_FIPS = 162, /* -enable-fips */ + QEMU_CAPS_SPICE_FILE_XFER_DISABLE = 163, /* -spice disable-agent-file-xfer */ + QEMU_CAPS_CHARDEV_SPICEPORT = 164, /* -chardev spiceport */ + QEMU_CAPS_DEVICE_USB_KBD = 165, /* -device usb-kbd */ + QEMU_CAPS_HOST_PCI_MULTIDOMAIN = 166, /* support domain > 0 in host pci address */ + QEMU_CAPS_MSG_TIMESTAMP = 167, /* -msg timestamp */ + QEMU_CAPS_ACTIVE_COMMIT = 168, /* block-commit works without 'top' */ + QEMU_CAPS_CHANGE_BACKING_FILE = 169, /* change name of backing file in metadata */ + QEMU_CAPS_OBJECT_MEMORY_RAM = 170, /* -object memory-backend-ram */ + QEMU_CAPS_NUMA = 171, /* newer -numa handling with disjoint cpu ranges */ + QEMU_CAPS_OBJECT_MEMORY_FILE = 172, /* -object memory-backend-file */ + QEMU_CAPS_OBJECT_USB_AUDIO = 173, /* usb-audio device support */ + QEMU_CAPS_RTC_RESET_REINJECTION = 174, /* rtc-reset-reinjection monitor command */ + QEMU_CAPS_SPLASH_TIMEOUT = 175, /* -boot splash-time */ + QEMU_CAPS_OBJECT_IOTHREAD = 176, /* -object iothread */ + QEMU_CAPS_MIGRATE_RDMA = 177, /* have rdma migration */ + QEMU_CAPS_DEVICE_IVSHMEM = 178, /* -device ivshmem */ + QEMU_CAPS_DRIVE_IOTUNE_MAX = 179, /* -drive bps_max= and friends */ + QEMU_CAPS_VGA_VGAMEM = 180, /* -device VGA.vgamem_mb */ + QEMU_CAPS_VMWARE_SVGA_VGAMEM = 181, /* -device vmware-svga.vgamem_mb */ + QEMU_CAPS_QXL_VGAMEM = 182, /* -device qxl.vgamem_mb */ + QEMU_CAPS_QXL_VGA_VGAMEM = 183, /* -device qxl-vga.vgamem_mb */ + QEMU_CAPS_DEVICE_PC_DIMM = 184, /* pc-dimm device */ + QEMU_CAPS_MACHINE_VMPORT_OPT = 185, /* -machine xxx,vmport=on/off/auto */ + QEMU_CAPS_AES_KEY_WRAP = 186, /* -machine aes_key_wrap */ + QEMU_CAPS_DEA_KEY_WRAP = 187, /* -machine dea_key_wrap */ + QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ + QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ + QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ + QEMU_CAPS_MIGRATION_EVENT = 191, /* MIGRATION event */ + QEMU_CAPS_OBJECT_GPEX = 192, /* have generic PCI host controller */ + QEMU_CAPS_DEVICE_IOH3420 = 193, /* -device ioh3420 */ + QEMU_CAPS_DEVICE_X3130_UPSTREAM = 194, /* -device x3130-upstream */ + QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM = 195, /* -device xio3130-downstream */ + QEMU_CAPS_DEVICE_RTL8139 = 196, /* -device rtl8139 */ + QEMU_CAPS_DEVICE_E1000 = 197, /* -device e1000 */ + QEMU_CAPS_DEVICE_VIRTIO_NET = 198, /* -device virtio-net-* */ + QEMU_CAPS_MACH_VIRT_GIC_VERSION = 199, /* -machine virt,gic-version */ + + QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; typedef struct _virQEMUCaps virQEMUCaps; -- 2.4.3

3 5

[libvirt] [PATCH] storage: Fix incorrect format for <disk> <auth> XML
by John Ferlan 07 Oct '15

07 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1256999 When creating a copy of the 'authdef', need to take into account the slight variation between <disk> and <pool> before blindly copying the 'authType' field. This ensures virStorageAuthDefFormat will properly format the <auth> XML for a <disk>. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virstoragefile.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2aa1d90..0b72cb3 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1522,7 +1522,12 @@ virStorageAuthDefCopy(const virStorageAuthDef *src) /* Not present for storage pool, but used for disk source */ if (VIR_STRDUP(ret->secrettype, src->secrettype) < 0) goto error; - ret->authType = src->authType; + /* A <disk> uses secrettype, while a <pool> uses authType, so + * if we have a secrettype, then don't copy authType; otherwise, + * we will format the authType in <disk> + */ + if (!ret->secrettype) + ret->authType = src->authType; ret->secretType = src->secretType; if (ret->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { memcpy(ret->secret.uuid, src->secret.uuid, sizeof(ret->secret.uuid)); -- 2.1.0

2 3

[libvirt] [PATCH 0/4] qemu: Refactor and fix qemuMigrationIsAllowed for offline migration
by Peter Krempa 07 Oct '15

07 Oct '15

Note that the patches are formatted with "--patience" so that the last patch isn't that ugly. Peter Krempa (4): qemu: migration: Split source and destination migration checks qemu: migration: Drop @def from qemuMigrationIsAllowed qemu: migration: Use migration flags in qemuMigrationIsAllowed qemu: migration: Skip few checks while doing offline migration src/qemu/qemu_driver.c | 8 +- src/qemu/qemu_migration.c | 186 ++++++++++++++++++++++++++-------------------- src/qemu/qemu_migration.h | 3 +- 3 files changed, 110 insertions(+), 87 deletions(-) -- 2.4.5

2 8

[libvirt] [PATCH 1/1] qemu: add support for multiple gluster hosts
by Prasanna Kumar Kalever 07 Oct '15

07 Oct '15

currently libvirt has the capability to parse only one host and convert that into URI formatted string, with the help of this patch libvirt will be able to parse multiple hosts from the domain xml and can convert that into JSON formatted string before: ------ example.xml: ... <disk type='network' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source protocol='gluster' name='testvol/a.qcow2'> <host name='1.2.3.4' port='24007' transport="tcp"/> </source> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> ... resultant string: file=gluster://1.2.3.4:24007/testvol/a.qcow2, \ if=none,id=drive-virtio-disk0,format=qcow2,cache=none after: ----- example.xml: ... <disk type='network' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source protocol='gluster' name='testvol/a.qcow2'> <host name='1.2.3.4' port='24009' transport="tcp"/> <host name='3.4.5.6' port="24008"/> <host name='5.6.7.8' /> </source> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> ... resultant string: -drive file=json:{ "file": { "driver": "gluster",, "volname": "testvol",, "image-path": "/a.qcow2",, "volfile-servers": [ { "server": "1.2.3.4",, "port": 24009,, "transport": "tcp" },, { "server": "3.4.5.6",, "port": 24008,, "transport": "tcp" },, { "server": "5.6.7.8",, "port": 24007,, "transport": "tcp" } ] },, "driver": "qcow2" } ,if=none,id=drive-virtio-disk0,cache=none if the number of hosts supplied is only one, then we use existing URI format for backward compatibility and if number of hosts is greater than one we switch to the new JSON format this patch requires qemu latest patch https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg07062.html Credits: Sincere thanks to Kevin Wolf <kwolf(a)redhat.com> and "Deepak C Shetty" <deepakcs(a)redhat.com> for their support Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever(a)redhat.com> --- src/qemu/qemu_command.c | 192 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 145 insertions(+), 47 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bb1835c..8c1bf1a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3256,16 +3256,106 @@ qemuNetworkDriveGetPort(int protocol, return -1; } +#define QEMU_DEFAULT_GLUSTER_PORT 24007 + +static virJSONValuePtr +qemuBuildGlusterDriveJSON(virStorageSourcePtr src) +{ + virJSONValuePtr parent = NULL; + virJSONValuePtr object = NULL; + virJSONValuePtr dict_array = NULL; + int port; + int i; + + if (!(parent = virJSONValueNewObject())) + return NULL; + /* 1. prepare { driver:"gluster", volname:"testvol", image-path:"/a.img"} */ + if (virJSONValueObjectAdd(parent, + "s:driver", virStorageNetProtocolTypeToString(src->protocol), + "s:volname", src->volume, + "s:image-path", src->path, + NULL) < 0) + goto cleanup; + + if (!(dict_array = virJSONValueNewArray())) + goto cleanup; + /* 2. prepare array [ {server:"1.2.3.4", port:24007, transport:"tcp"} , + * {server:"5.6.7.8", port:24008, transport:"rdma"}, + * {}, ... ] */ + for (i = 0; i < src->nhosts; i++) { + if (!(object = virJSONValueNewObject())) + goto cleanup; + port = qemuNetworkDriveGetPort(src->protocol, src->hosts[i].port); + if (virJSONValueObjectAdd(object, "s:server", src->hosts[i].name, + "i:port", port ? port : QEMU_DEFAULT_GLUSTER_PORT , + "s:transport", + virStorageNetHostTransportTypeToString(src->hosts[i].transport), + NULL) < 0) + goto cleanup; + if (virJSONValueArrayAppend(dict_array, object) < 0) { + virJSONValueFree(object); + goto cleanup; + } + } + /* 3. append 1 and 2 + * { driver:"gluster", volname:"testvol", image-path:"/a.img", + * volfile-servers :[ {server:"1.2.3.4", port:24007, transport:"tcp"} , + * {server:"5.6.7.8", port:24008, transport:"rdma"}, + * {}, ... ] } + */ + if (virJSONValueObjectAppend(parent, "volfile-servers", dict_array) < 0) { + virJSONValueFree(dict_array); + goto cleanup; + } + /* 4. assign key to 3 + * { file: { driver:"gluster", volname:"testvol", image-path:"/a.img", + * volfile-servers :[ {server:"1.2.3.4", port:24007, transport:"tcp"} , + * {server:"5.6.7.8", port:24008, transport:"rdma"}, + * {}, ... ] } } + */ + if (!(object = virJSONValueNewObject())) + goto cleanup; + if (virJSONValueObjectAppend(object, "file", parent) < 0) { + virJSONValueFree(parent); + goto cleanup; + } + /* 5. append format to 4 + * { file: { driver:"gluster", volname:"testvol", image-path:"/a.img", + * volfile-servers :[ {server:"1.2.3.4", port:24007, transport:"tcp"} , + * {server:"5.6.7.8", port:24008, transport:"rdma"}, + * {}, ... ] }, driver:"qcow2" } + */ + if (virJSONValueObjectAdd(object, + "s:driver", virStorageFileFormatTypeToString(src->format), + NULL) < 0) + goto cleanup; + else + /* since we have already captured the format type, let's make it '0' to + * avoid further checks for format information + */ + src->format = 0; + + return object; + +cleanup: + virJSONValueFree(dict_array); + virJSONValueFree(parent); + virJSONValueFree(object); + return NULL; +} + #define QEMU_DEFAULT_NBD_PORT "10809" static char * -qemuBuildNetworkDriveURI(virStorageSourcePtr src, +qemuBuildNetworkDriveStr(virStorageSourcePtr src, const char *username, const char *secret) { char *ret = NULL; + char *str = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; virURIPtr uri = NULL; + virJSONValuePtr json = NULL; size_t i; switch ((virStorageNetProtocol) src->protocol) { @@ -3331,61 +3421,67 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: - if (src->nhosts != 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("protocol '%s' accepts only one host"), - virStorageNetProtocolTypeToString(src->protocol)); - goto cleanup; - } - - if (VIR_ALLOC(uri) < 0) - goto cleanup; - - if (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP) { - if (VIR_STRDUP(uri->scheme, - virStorageNetProtocolTypeToString(src->protocol)) < 0) + if (src->nhosts == 1) { + /* URI syntax generation */ + if (VIR_ALLOC(uri) < 0) goto cleanup; - } else { - if (virAsprintf(&uri->scheme, "%s+%s", - virStorageNetProtocolTypeToString(src->protocol), - virStorageNetHostTransportTypeToString(src->hosts->transport)) < 0) - goto cleanup; - } - - if ((uri->port = qemuNetworkDriveGetPort(src->protocol, src->hosts->port)) < 0) - goto cleanup; - if (src->path) { - if (src->volume) { - if (virAsprintf(&uri->path, "/%s%s", - src->volume, src->path) < 0) + if (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP) { + if (VIR_STRDUP(uri->scheme, + virStorageNetProtocolTypeToString(src->protocol)) < 0) goto cleanup; } else { - if (virAsprintf(&uri->path, "%s%s", - src->path[0] == '/' ? "" : "/", - src->path) < 0) + if (virAsprintf(&uri->scheme, "%s+%s", + virStorageNetProtocolTypeToString(src->protocol), + virStorageNetHostTransportTypeToString(src->hosts->transport)) < 0) goto cleanup; } - } - if (src->hosts->socket && - virAsprintf(&uri->query, "socket=%s", src->hosts->socket) < 0) - goto cleanup; + if ((uri->port = qemuNetworkDriveGetPort(src->protocol, src->hosts->port)) < 0) + goto cleanup; - if (username) { - if (secret) { - if (virAsprintf(&uri->user, "%s:%s", username, secret) < 0) - goto cleanup; - } else { - if (VIR_STRDUP(uri->user, username) < 0) - goto cleanup; + if (src->path) { + if (src->volume) { + if (virAsprintf(&uri->path, "/%s%s", + src->volume, src->path) < 0) + goto cleanup; + } else { + if (virAsprintf(&uri->path, "%s%s", + src->path[0] == '/' ? "" : "/", + src->path) < 0) + goto cleanup; + } } - } - if (VIR_STRDUP(uri->server, src->hosts->name) < 0) - goto cleanup; + if (src->hosts->socket && + virAsprintf(&uri->query, "socket=%s", src->hosts->socket) < 0) + goto cleanup; - ret = virURIFormat(uri); + if (username) { + if (secret) { + if (virAsprintf(&uri->user, "%s:%s", username, secret) < 0) + goto cleanup; + } else { + if (VIR_STRDUP(uri->user, username) < 0) + goto cleanup; + } + } + + if (VIR_STRDUP(uri->server, src->hosts->name) < 0) + goto cleanup; + + ret = virURIFormat(uri); + } else { + /* switch to new json formated syntax */ + if(!(json = qemuBuildGlusterDriveJSON(src))) + goto cleanup; + + if (!(str = virJSONValueToString(json, false))) + goto cleanup; + + if (virAsprintf (&ret, "json:%s", str) < 0) + goto cleanup; + } break; @@ -3472,7 +3568,9 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, } cleanup: + VIR_FREE(str); virBufferFreeAndReset(&buf); + virJSONValueFree(json); virURIFree(uri); return ret; @@ -3530,7 +3628,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src, break; case VIR_STORAGE_TYPE_NETWORK: - if (!(*source = qemuBuildNetworkDriveURI(src, username, secret))) + if (!(*source = qemuBuildNetworkDriveStr(src, username, secret))) goto cleanup; break; @@ -6391,7 +6489,7 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virConnectPtr conn, src.nhosts = iscsisrc->nhosts; /* Rather than pull what we think we want - use the network disk code */ - source = qemuBuildNetworkDriveURI(&src, username, secret); + source = qemuBuildNetworkDriveStr(&src, username, secret); cleanup: VIR_FREE(secret); -- 2.1.0

5 15

[libvirt] [libvirt-python PATCH 00/23] Cleanup of the libvirt-python C code
by Pavel Hrdina 07 Oct '15

07 Oct '15

This patch series tries to cleanup the libvirt-python C code and also make it more readable. It also fixes places, where we didn't checked for return values and where we also returned wrong values in case of errors. There are some other minor issues, that I've found. Pavel Hrdina (23): update virDomainGetVcpus xml API description refactor the function to not override python exceptions remove useless check for NULL before Py_XDECREF drop unnecessary goto Move utils and shared code into libvirt-utils cleanup functions definition indent labels by one space fix indentation wrap lines to 80 columns Return NULL if python exception is set Return correct python object Return NULL and set an exception if allocation fails Use VIR_PY_NONE instead use Py_CLEAR instead of Py_XDECREF followed by NULL assignment all Py*_New function has to be checked for return value change the order of some statements drop unnecessary py_retval variable improve usage of cleanup paths utils: introduce new macro helpers for tuple, list and dict objects use VIR_PY_TUPLE_GOTO use VYR_PY_LIST_SET_GOTO and VIR_PY_LIST_APPEND_GOTO use VIR_PY_DICT_SET_GOTO coverity: resolve dead_error_condition libvirt-lxc-override.c | 61 +- libvirt-override-api.xml | 4 +- libvirt-override.c | 3156 +++++++++++++++++++++------------------------- libvirt-qemu-override.c | 60 +- libvirt-utils.c | 422 ++++++- libvirt-utils.h | 133 ++ typewrappers.c | 65 +- 7 files changed, 2047 insertions(+), 1854 deletions(-) -- 2.5.3

2 47

[libvirt] [PATCH] spec: Delete .git after applying patches
by Cole Robinson 07 Oct '15

07 Oct '15

I'm hitting this little annoyance in fedora's package repo: $ fedpkg prep Downloading libvirt-1.2.20.tar.gz ... + /usr/bin/gzip -dc /home/crobinso/src/fedora/libvirt/libvirt-1.2.20.tar.gz $ git clean -xdf Removing libvirt-1.2.20.tar.gz Skipping repository libvirt-1.2.20/ We git-ify the libvirt directory as part of applying patches in the spec file, but 'git clean' will ignore subfolders that appear to be standalone git repos. Let's just delete the .git directory after we're done with it. --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index ed401f7..9dff994 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1256,6 +1256,7 @@ if [ $COUNT -gt 0 ]; then fi echo "Applied $COUNT patches" rm -f $PATCHLIST +rm -rf .git %build %if ! %{with_xen} -- 2.5.0

2 1