2018-02-09 17:35:42 +01:00
|
|
|
From 6609ed5a377c3beaf8389e870b6851856cee42c7 Mon Sep 17 00:00:00 2001
|
|
|
|
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
|
|
|
|
Date: Thu, 4 Jan 2018 12:04:07 +0100
|
|
|
|
Subject: [PATCH 1/3] Extract stats functions from the qemu driver
|
|
|
|
|
|
|
|
Some of the qemu functions getting statistics can easily be reused in
|
|
|
|
other drivers. Create a conf/domain_stats.[ch] pair to host some of
|
|
|
|
them.
|
|
|
|
---
|
|
|
|
src/Makefile.am | 1 +
|
|
|
|
src/conf/domain_stats.c | 139 +++++++++++++++++++++++++++++++++++++++++
|
|
|
|
src/conf/domain_stats.h | 64 +++++++++++++++++++
|
|
|
|
src/libvirt_private.syms | 4 ++
|
|
|
|
src/qemu/qemu_driver.c | 158 +++--------------------------------------------
|
|
|
|
src/util/vircgroup.c | 46 ++++++++++++++
|
|
|
|
src/util/vircgroup.h | 4 ++
|
|
|
|
7 files changed, 265 insertions(+), 151 deletions(-)
|
|
|
|
create mode 100644 src/conf/domain_stats.c
|
|
|
|
create mode 100644 src/conf/domain_stats.h
|
|
|
|
|
2019-06-03 22:11:36 +02:00
|
|
|
Index: libvirt-5.4.0/src/conf/domain_stats.c
|
Accepting request 583090 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.1.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch,
68eed56b-conf-smbios-oem-strings.patch,
76977061-qemu-smbios-oem-strings.patch,
0c710a37-libxl-resume-lock-on-mig-failure.patch,
759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch,
c2dc6698-fix-deadlock-obtaining-hostname.patch,
c391e07e-libxl-clock-settings.patch,
ef71caea-libxl-memalign.patch,
suse-apparmor-signal.patch
OBS-URL: https://build.opensuse.org/request/show/583090
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=674
2018-03-05 18:46:32 +01:00
|
|
|
===================================================================
|
2018-02-09 17:35:42 +01:00
|
|
|
--- /dev/null
|
2019-06-03 22:11:36 +02:00
|
|
|
+++ libvirt-5.4.0/src/conf/domain_stats.c
|
2018-02-09 17:35:42 +01:00
|
|
|
@@ -0,0 +1,139 @@
|
|
|
|
+/*
|
|
|
|
+ * domain_stats.c: domain stats extraction helpers
|
|
|
|
+ *
|
|
|
|
+ * Copyright (C) 2006-2016 Red Hat, Inc.
|
|
|
|
+ * Copyright (C) 2006-2008 Daniel P. Berrange
|
|
|
|
+ * Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
|
|
|
+ *
|
|
|
|
+ * This library is free software; you can redistribute it and/or
|
|
|
|
+ * modify it under the terms of the GNU Lesser General Public
|
|
|
|
+ * License as published by the Free Software Foundation; either
|
|
|
|
+ * version 2.1 of the License, or (at your option) any later version.
|
|
|
|
+ *
|
|
|
|
+ * This library is distributed in the hope that it will be useful,
|
|
|
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
+ * Lesser General Public License for more details.
|
|
|
|
+ *
|
|
|
|
+ * You should have received a copy of the GNU Lesser General Public
|
|
|
|
+ * License along with this library. If not, see
|
|
|
|
+ * <http://www.gnu.org/licenses/>.
|
|
|
|
+ *
|
|
|
|
+ * Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
|
+ */
|
|
|
|
+
|
|
|
|
+#include <config.h>
|
|
|
|
+
|
|
|
|
+#include <stdio.h>
|
|
|
|
+
|
|
|
|
+#include "virlog.h"
|
|
|
|
+#include "domain_stats.h"
|
|
|
|
+#include "virtypedparam.h"
|
|
|
|
+#include "virnetdevtap.h"
|
|
|
|
+#include "virnetdevopenvswitch.h"
|
|
|
|
+
|
|
|
|
+#define VIR_FROM_THIS VIR_FROM_DOMAIN
|
|
|
|
+
|
|
|
|
+VIR_LOG_INIT("conf.domain_stats");
|
|
|
|
+
|
|
|
|
+int
|
|
|
|
+virDomainStatsGetState(virDomainObjPtr dom,
|
|
|
|
+ virDomainStatsRecordPtr record,
|
|
|
|
+ int *maxparams)
|
|
|
|
+{
|
|
|
|
+ if (virTypedParamsAddInt(&record->params,
|
|
|
|
+ &record->nparams,
|
|
|
|
+ maxparams,
|
|
|
|
+ "state.state",
|
|
|
|
+ dom->state.state) < 0)
|
|
|
|
+ return -1;
|
|
|
|
+
|
|
|
|
+ if (virTypedParamsAddInt(&record->params,
|
|
|
|
+ &record->nparams,
|
|
|
|
+ maxparams,
|
|
|
|
+ "state.reason",
|
|
|
|
+ dom->state.reason) < 0)
|
|
|
|
+ return -1;
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+#define STATS_ADD_NET_PARAM(record, maxparams, num, name, value) \
|
|
|
|
+do { \
|
|
|
|
+ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
|
|
|
|
+ snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, \
|
|
|
|
+ "net.%zu.%s", num, name); \
|
|
|
|
+ if (value >= 0 && virTypedParamsAddULLong(&(record)->params, \
|
|
|
|
+ &(record)->nparams, \
|
|
|
|
+ maxparams, \
|
|
|
|
+ param_name, \
|
|
|
|
+ value) < 0) \
|
|
|
|
+ return -1; \
|
|
|
|
+} while (0)
|
|
|
|
+
|
|
|
|
+int
|
|
|
|
+virDomainStatsGetInterface(virDomainObjPtr dom,
|
|
|
|
+ virDomainStatsRecordPtr record,
|
|
|
|
+ int *maxparams)
|
|
|
|
+{
|
|
|
|
+ size_t i;
|
|
|
|
+ struct _virDomainInterfaceStats tmp;
|
|
|
|
+ int ret = -1;
|
|
|
|
+
|
|
|
|
+ if (!virDomainObjIsActive(dom))
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ VIR_DOMAIN_STATS_ADD_COUNT_PARAM(record, maxparams, "net", dom->def->nnets);
|
|
|
|
+
|
|
|
|
+ /* Check the path is one of the domain's network interfaces. */
|
|
|
|
+ for (i = 0; i < dom->def->nnets; i++) {
|
|
|
|
+ virDomainNetDefPtr net = dom->def->nets[i];
|
|
|
|
+ virDomainNetType actualType;
|
|
|
|
+
|
|
|
|
+ if (!net->ifname)
|
|
|
|
+ continue;
|
|
|
|
+
|
|
|
|
+ memset(&tmp, 0, sizeof(tmp));
|
|
|
|
+
|
|
|
|
+ actualType = virDomainNetGetActualType(net);
|
|
|
|
+
|
|
|
|
+ VIR_DOMAIN_STATS_ADD_NAME_PARAM(record, maxparams,
|
|
|
|
+ "net", "name", i, net->ifname);
|
|
|
|
+
|
|
|
|
+ if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
|
|
|
|
+ if (virNetDevOpenvswitchInterfaceStats(net->ifname, &tmp) < 0) {
|
|
|
|
+ virResetLastError();
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ if (virNetDevTapInterfaceStats(net->ifname, &tmp,
|
|
|
|
+ !virDomainNetTypeSharesHostView(net)) < 0) {
|
|
|
|
+ virResetLastError();
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ STATS_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
+ "rx.bytes", tmp.rx_bytes);
|
|
|
|
+ STATS_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
+ "rx.pkts", tmp.rx_packets);
|
|
|
|
+ STATS_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
+ "rx.errs", tmp.rx_errs);
|
|
|
|
+ STATS_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
+ "rx.drop", tmp.rx_drop);
|
|
|
|
+ STATS_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
+ "tx.bytes", tmp.tx_bytes);
|
|
|
|
+ STATS_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
+ "tx.pkts", tmp.tx_packets);
|
|
|
|
+ STATS_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
+ "tx.errs", tmp.tx_errs);
|
|
|
|
+ STATS_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
+ "tx.drop", tmp.tx_drop);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ ret = 0;
|
|
|
|
+ cleanup:
|
|
|
|
+ return ret;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+#undef STATS_ADD_NET_PARAM
|
2019-06-03 22:11:36 +02:00
|
|
|
Index: libvirt-5.4.0/src/conf/domain_stats.h
|
Accepting request 583090 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.1.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch,
68eed56b-conf-smbios-oem-strings.patch,
76977061-qemu-smbios-oem-strings.patch,
0c710a37-libxl-resume-lock-on-mig-failure.patch,
759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch,
c2dc6698-fix-deadlock-obtaining-hostname.patch,
c391e07e-libxl-clock-settings.patch,
ef71caea-libxl-memalign.patch,
suse-apparmor-signal.patch
OBS-URL: https://build.opensuse.org/request/show/583090
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=674
2018-03-05 18:46:32 +01:00
|
|
|
===================================================================
|
2018-02-09 17:35:42 +01:00
|
|
|
--- /dev/null
|
2019-06-03 22:11:36 +02:00
|
|
|
+++ libvirt-5.4.0/src/conf/domain_stats.h
|
2018-02-09 17:35:42 +01:00
|
|
|
@@ -0,0 +1,64 @@
|
|
|
|
+/*
|
|
|
|
+ * domain_stats.h: domain stats extraction helpers
|
|
|
|
+ *
|
|
|
|
+ * Copyright (C) 2006-2016 Red Hat, Inc.
|
|
|
|
+ * Copyright (C) 2006-2008 Daniel P. Berrange
|
|
|
|
+ * Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
|
|
|
+ *
|
|
|
|
+ * This library is free software; you can redistribute it and/or
|
|
|
|
+ * modify it under the terms of the GNU Lesser General Public
|
|
|
|
+ * License as published by the Free Software Foundation; either
|
|
|
|
+ * version 2.1 of the License, or (at your option) any later version.
|
|
|
|
+ *
|
|
|
|
+ * This library is distributed in the hope that it will be useful,
|
|
|
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
+ * Lesser General Public License for more details.
|
|
|
|
+ *
|
|
|
|
+ * You should have received a copy of the GNU Lesser General Public
|
|
|
|
+ * License along with this library. If not, see
|
|
|
|
+ * <http://www.gnu.org/licenses/>.
|
|
|
|
+ *
|
|
|
|
+ * Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
|
+ */
|
|
|
|
+#ifndef __DOMAIN_STATS_H
|
|
|
|
+# define __DOMAIN_STATS_H
|
|
|
|
+
|
|
|
|
+# include "internal.h"
|
|
|
|
+# include "domain_conf.h"
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+# define VIR_DOMAIN_STATS_ADD_COUNT_PARAM(record, maxparams, type, count) \
|
|
|
|
+do { \
|
|
|
|
+ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
|
|
|
|
+ snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, "%s.count", type); \
|
|
|
|
+ if (virTypedParamsAddUInt(&(record)->params, \
|
|
|
|
+ &(record)->nparams, \
|
|
|
|
+ maxparams, \
|
|
|
|
+ param_name, \
|
|
|
|
+ count) < 0) \
|
|
|
|
+ goto cleanup; \
|
|
|
|
+} while (0)
|
|
|
|
+
|
|
|
|
+# define VIR_DOMAIN_STATS_ADD_NAME_PARAM(record, maxparams, type, subtype, num, name) \
|
|
|
|
+do { \
|
|
|
|
+ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
|
|
|
|
+ snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, \
|
|
|
|
+ "%s.%zu.%s", type, num, subtype); \
|
|
|
|
+ if (virTypedParamsAddString(&(record)->params, \
|
|
|
|
+ &(record)->nparams, \
|
|
|
|
+ maxparams, \
|
|
|
|
+ param_name, \
|
|
|
|
+ name) < 0) \
|
|
|
|
+ goto cleanup; \
|
|
|
|
+} while (0)
|
|
|
|
+
|
|
|
|
+int virDomainStatsGetState(virDomainObjPtr dom,
|
|
|
|
+ virDomainStatsRecordPtr record,
|
|
|
|
+ int *maxparams);
|
|
|
|
+
|
|
|
|
+int virDomainStatsGetInterface(virDomainObjPtr dom,
|
|
|
|
+ virDomainStatsRecordPtr record,
|
|
|
|
+ int *maxparams);
|
|
|
|
+
|
|
|
|
+#endif /* __DOMAIN_STATS_H */
|
2019-06-03 22:11:36 +02:00
|
|
|
Index: libvirt-5.4.0/src/libvirt_private.syms
|
Accepting request 583090 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.1.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch,
68eed56b-conf-smbios-oem-strings.patch,
76977061-qemu-smbios-oem-strings.patch,
0c710a37-libxl-resume-lock-on-mig-failure.patch,
759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch,
c2dc6698-fix-deadlock-obtaining-hostname.patch,
c391e07e-libxl-clock-settings.patch,
ef71caea-libxl-memalign.patch,
suse-apparmor-signal.patch
OBS-URL: https://build.opensuse.org/request/show/583090
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=674
2018-03-05 18:46:32 +01:00
|
|
|
===================================================================
|
2019-06-03 22:11:36 +02:00
|
|
|
--- libvirt-5.4.0.orig/src/libvirt_private.syms
|
|
|
|
+++ libvirt-5.4.0/src/libvirt_private.syms
|
2019-05-08 21:35:37 +02:00
|
|
|
@@ -678,6 +678,9 @@ virDomainConfNWFilterInstantiate;
|
2018-02-09 17:35:42 +01:00
|
|
|
virDomainConfNWFilterTeardown;
|
|
|
|
virDomainConfVMNWFilterTeardown;
|
|
|
|
|
|
|
|
+# conf/domain_stats.h
|
|
|
|
+virDomainStatsGetInterface;
|
|
|
|
+virDomainStatsGetState;
|
|
|
|
|
|
|
|
# conf/interface_conf.h
|
|
|
|
virInterfaceDefFormat;
|
2019-05-08 21:35:37 +02:00
|
|
|
@@ -1591,6 +1594,7 @@ virCgroupGetMemoryUsage;
|
2018-02-09 17:35:42 +01:00
|
|
|
virCgroupGetMemSwapHardLimit;
|
|
|
|
virCgroupGetMemSwapUsage;
|
|
|
|
virCgroupGetPercpuStats;
|
|
|
|
+virCgroupGetStatsCpu;
|
|
|
|
virCgroupHasController;
|
|
|
|
virCgroupHasEmptyTasks;
|
Accepting request 636920 from home:jfehlig:branches:Virtualization
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
2018-09-20 19:06:17 +02:00
|
|
|
virCgroupKillPainfully;
|
2019-06-03 22:11:36 +02:00
|
|
|
Index: libvirt-5.4.0/src/qemu/qemu_driver.c
|
Accepting request 583090 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.1.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch,
68eed56b-conf-smbios-oem-strings.patch,
76977061-qemu-smbios-oem-strings.patch,
0c710a37-libxl-resume-lock-on-mig-failure.patch,
759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch,
c2dc6698-fix-deadlock-obtaining-hostname.patch,
c391e07e-libxl-clock-settings.patch,
ef71caea-libxl-memalign.patch,
suse-apparmor-signal.patch
OBS-URL: https://build.opensuse.org/request/show/583090
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=674
2018-03-05 18:46:32 +01:00
|
|
|
===================================================================
|
2019-06-03 22:11:36 +02:00
|
|
|
--- libvirt-5.4.0.orig/src/qemu/qemu_driver.c
|
|
|
|
+++ libvirt-5.4.0/src/qemu/qemu_driver.c
|
2019-01-16 00:46:12 +01:00
|
|
|
@@ -67,6 +67,7 @@
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
#include "virarptable.h"
|
2018-02-09 17:35:42 +01:00
|
|
|
#include "viruuid.h"
|
|
|
|
#include "domain_conf.h"
|
|
|
|
+#include "domain_stats.h"
|
|
|
|
#include "domain_audit.h"
|
|
|
|
#include "node_device_conf.h"
|
|
|
|
#include "virpci.h"
|
2019-06-03 22:11:36 +02:00
|
|
|
@@ -19943,21 +19944,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
|
2018-02-09 17:35:42 +01:00
|
|
|
int *maxparams,
|
|
|
|
unsigned int privflags ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
- if (virTypedParamsAddInt(&record->params,
|
|
|
|
- &record->nparams,
|
|
|
|
- maxparams,
|
|
|
|
- "state.state",
|
|
|
|
- dom->state.state) < 0)
|
|
|
|
- return -1;
|
|
|
|
-
|
|
|
|
- if (virTypedParamsAddInt(&record->params,
|
|
|
|
- &record->nparams,
|
|
|
|
- maxparams,
|
|
|
|
- "state.reason",
|
|
|
|
- dom->state.reason) < 0)
|
|
|
|
- return -1;
|
|
|
|
-
|
|
|
|
- return 0;
|
|
|
|
+ return virDomainStatsGetState(dom, record, maxparams);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-06-03 22:11:36 +02:00
|
|
|
@@ -20147,37 +20134,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
|
2018-12-04 00:17:47 +01:00
|
|
|
int *maxparams)
|
2018-02-09 17:35:42 +01:00
|
|
|
{
|
|
|
|
qemuDomainObjPrivatePtr priv = dom->privateData;
|
|
|
|
- unsigned long long cpu_time = 0;
|
|
|
|
- unsigned long long user_time = 0;
|
|
|
|
- unsigned long long sys_time = 0;
|
|
|
|
- int err = 0;
|
|
|
|
-
|
|
|
|
- if (!priv->cgroup)
|
|
|
|
- return 0;
|
|
|
|
-
|
|
|
|
- err = virCgroupGetCpuacctUsage(priv->cgroup, &cpu_time);
|
|
|
|
- if (!err && virTypedParamsAddULLong(&record->params,
|
|
|
|
- &record->nparams,
|
|
|
|
- maxparams,
|
|
|
|
- "cpu.time",
|
|
|
|
- cpu_time) < 0)
|
|
|
|
- return -1;
|
|
|
|
-
|
|
|
|
- err = virCgroupGetCpuacctStat(priv->cgroup, &user_time, &sys_time);
|
|
|
|
- if (!err && virTypedParamsAddULLong(&record->params,
|
|
|
|
- &record->nparams,
|
|
|
|
- maxparams,
|
|
|
|
- "cpu.user",
|
|
|
|
- user_time) < 0)
|
|
|
|
- return -1;
|
|
|
|
- if (!err && virTypedParamsAddULLong(&record->params,
|
|
|
|
- &record->nparams,
|
|
|
|
- maxparams,
|
|
|
|
- "cpu.system",
|
|
|
|
- sys_time) < 0)
|
|
|
|
- return -1;
|
|
|
|
-
|
|
|
|
- return 0;
|
|
|
|
+ return virCgroupGetStatsCpu(priv->cgroup, record, maxparams);
|
|
|
|
}
|
|
|
|
|
2018-12-04 00:17:47 +01:00
|
|
|
|
2019-06-03 22:11:36 +02:00
|
|
|
@@ -20373,44 +20330,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
|
2018-02-09 17:35:42 +01:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
-#define QEMU_ADD_COUNT_PARAM(record, maxparams, type, count) \
|
|
|
|
-do { \
|
|
|
|
- char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
|
|
|
|
- snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, "%s.count", type); \
|
|
|
|
- if (virTypedParamsAddUInt(&(record)->params, \
|
|
|
|
- &(record)->nparams, \
|
|
|
|
- maxparams, \
|
|
|
|
- param_name, \
|
|
|
|
- count) < 0) \
|
|
|
|
- goto cleanup; \
|
|
|
|
-} while (0)
|
|
|
|
-
|
|
|
|
-#define QEMU_ADD_NAME_PARAM(record, maxparams, type, subtype, num, name) \
|
|
|
|
-do { \
|
|
|
|
- char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
|
|
|
|
- snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, \
|
|
|
|
- "%s.%zu.%s", type, num, subtype); \
|
|
|
|
- if (virTypedParamsAddString(&(record)->params, \
|
|
|
|
- &(record)->nparams, \
|
|
|
|
- maxparams, \
|
|
|
|
- param_name, \
|
|
|
|
- name) < 0) \
|
|
|
|
- goto cleanup; \
|
|
|
|
-} while (0)
|
|
|
|
-
|
|
|
|
-#define QEMU_ADD_NET_PARAM(record, maxparams, num, name, value) \
|
|
|
|
-do { \
|
|
|
|
- char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
|
|
|
|
- snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, \
|
|
|
|
- "net.%zu.%s", num, name); \
|
|
|
|
- if (value >= 0 && virTypedParamsAddULLong(&(record)->params, \
|
|
|
|
- &(record)->nparams, \
|
|
|
|
- maxparams, \
|
|
|
|
- param_name, \
|
|
|
|
- value) < 0) \
|
|
|
|
- return -1; \
|
|
|
|
-} while (0)
|
|
|
|
-
|
|
|
|
static int
|
|
|
|
qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
|
|
|
|
virDomainObjPtr dom,
|
2019-06-03 22:11:36 +02:00
|
|
|
@@ -20418,68 +20337,9 @@ qemuDomainGetStatsInterface(virQEMUDrive
|
2018-02-09 17:35:42 +01:00
|
|
|
int *maxparams,
|
|
|
|
unsigned int privflags ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
- size_t i;
|
|
|
|
- struct _virDomainInterfaceStats tmp;
|
|
|
|
- int ret = -1;
|
|
|
|
-
|
|
|
|
- if (!virDomainObjIsActive(dom))
|
|
|
|
- return 0;
|
|
|
|
-
|
|
|
|
- QEMU_ADD_COUNT_PARAM(record, maxparams, "net", dom->def->nnets);
|
|
|
|
-
|
|
|
|
- /* Check the path is one of the domain's network interfaces. */
|
|
|
|
- for (i = 0; i < dom->def->nnets; i++) {
|
|
|
|
- virDomainNetDefPtr net = dom->def->nets[i];
|
|
|
|
- virDomainNetType actualType;
|
|
|
|
-
|
|
|
|
- if (!net->ifname)
|
|
|
|
- continue;
|
|
|
|
-
|
|
|
|
- memset(&tmp, 0, sizeof(tmp));
|
|
|
|
-
|
|
|
|
- actualType = virDomainNetGetActualType(net);
|
|
|
|
-
|
|
|
|
- QEMU_ADD_NAME_PARAM(record, maxparams,
|
|
|
|
- "net", "name", i, net->ifname);
|
|
|
|
-
|
|
|
|
- if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
|
|
|
|
- if (virNetDevOpenvswitchInterfaceStats(net->ifname, &tmp) < 0) {
|
|
|
|
- virResetLastError();
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- if (virNetDevTapInterfaceStats(net->ifname, &tmp,
|
|
|
|
- !virDomainNetTypeSharesHostView(net)) < 0) {
|
|
|
|
- virResetLastError();
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- QEMU_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
- "rx.bytes", tmp.rx_bytes);
|
|
|
|
- QEMU_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
- "rx.pkts", tmp.rx_packets);
|
|
|
|
- QEMU_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
- "rx.errs", tmp.rx_errs);
|
|
|
|
- QEMU_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
- "rx.drop", tmp.rx_drop);
|
|
|
|
- QEMU_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
- "tx.bytes", tmp.tx_bytes);
|
|
|
|
- QEMU_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
- "tx.pkts", tmp.tx_packets);
|
|
|
|
- QEMU_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
- "tx.errs", tmp.tx_errs);
|
|
|
|
- QEMU_ADD_NET_PARAM(record, maxparams, i,
|
|
|
|
- "tx.drop", tmp.tx_drop);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- ret = 0;
|
|
|
|
- cleanup:
|
|
|
|
- return ret;
|
|
|
|
+ return virDomainStatsGetInterface(dom, record, maxparams);
|
|
|
|
}
|
|
|
|
|
|
|
|
-#undef QEMU_ADD_NET_PARAM
|
|
|
|
-
|
|
|
|
#define QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, num, name, value) \
|
|
|
|
do { \
|
|
|
|
char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
|
2019-06-03 22:11:36 +02:00
|
|
|
@@ -20712,10 +20572,10 @@ qemuDomainGetStatsBlockExportHeader(virD
|
Accepting request 636920 from home:jfehlig:branches:Virtualization
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
2018-09-20 19:06:17 +02:00
|
|
|
{
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
- QEMU_ADD_NAME_PARAM(records, nrecords, "block", "name", recordnr, disk->dst);
|
|
|
|
+ VIR_DOMAIN_STATS_ADD_NAME_PARAM(records, nrecords, "block", "name", recordnr, disk->dst);
|
2018-02-09 17:35:42 +01:00
|
|
|
|
|
|
|
if (virStorageSourceIsLocalStorage(src) && src->path)
|
Accepting request 636920 from home:jfehlig:branches:Virtualization
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
2018-09-20 19:06:17 +02:00
|
|
|
- QEMU_ADD_NAME_PARAM(records, nrecords, "block", "path", recordnr, src->path);
|
|
|
|
+ VIR_DOMAIN_STATS_ADD_NAME_PARAM(records, nrecords, "block", "path", recordnr, src->path);
|
|
|
|
if (src->id)
|
|
|
|
QEMU_ADD_BLOCK_PARAM_UI(records, nrecords, recordnr, "backingIndex",
|
|
|
|
src->id);
|
2019-06-03 22:11:36 +02:00
|
|
|
@@ -20869,7 +20729,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
|
2018-02-09 17:35:42 +01:00
|
|
|
* after the iteration than it is to iterate twice; but we still
|
|
|
|
* want count listed first. */
|
|
|
|
count_index = record->nparams;
|
|
|
|
- QEMU_ADD_COUNT_PARAM(record, maxparams, "block", 0);
|
|
|
|
+ VIR_DOMAIN_STATS_ADD_COUNT_PARAM(record, maxparams, "block", 0);
|
|
|
|
|
|
|
|
for (i = 0; i < dom->def->ndisks; i++) {
|
Accepting request 636920 from home:jfehlig:branches:Virtualization
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
2018-09-20 19:06:17 +02:00
|
|
|
if (qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats, nodestats,
|
2019-06-03 22:11:36 +02:00
|
|
|
@@ -20894,8 +20754,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
|
2018-02-09 17:35:42 +01:00
|
|
|
|
|
|
|
#undef QEMU_ADD_BLOCK_PARAM_ULL
|
|
|
|
|
|
|
|
-#undef QEMU_ADD_NAME_PARAM
|
|
|
|
-
|
2018-12-04 00:17:47 +01:00
|
|
|
#define QEMU_ADD_IOTHREAD_PARAM_UI(record, maxparams, id, name, value) \
|
|
|
|
do { \
|
|
|
|
char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
|
2019-06-03 22:11:36 +02:00
|
|
|
@@ -20947,7 +20805,7 @@ qemuDomainGetStatsIOThread(virQEMUDriver
|
2018-12-04 00:17:47 +01:00
|
|
|
if (niothreads == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
- QEMU_ADD_COUNT_PARAM(record, maxparams, "iothread", niothreads);
|
|
|
|
+ VIR_DOMAIN_STATS_ADD_COUNT_PARAM(record, maxparams, "iothread", niothreads);
|
|
|
|
|
|
|
|
for (i = 0; i < niothreads; i++) {
|
|
|
|
if (iothreads[i]->poll_valid) {
|
2019-06-03 22:11:36 +02:00
|
|
|
@@ -20980,8 +20838,6 @@ qemuDomainGetStatsIOThread(virQEMUDriver
|
2018-12-04 00:17:47 +01:00
|
|
|
|
|
|
|
#undef QEMU_ADD_IOTHREAD_PARAM_ULL
|
|
|
|
|
2018-02-09 17:35:42 +01:00
|
|
|
-#undef QEMU_ADD_COUNT_PARAM
|
|
|
|
-
|
|
|
|
static int
|
|
|
|
qemuDomainGetStatsPerfOneEvent(virPerfPtr perf,
|
|
|
|
virPerfEventType type,
|
2019-06-03 22:11:36 +02:00
|
|
|
Index: libvirt-5.4.0/src/util/vircgroup.c
|
Accepting request 583090 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.1.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch,
68eed56b-conf-smbios-oem-strings.patch,
76977061-qemu-smbios-oem-strings.patch,
0c710a37-libxl-resume-lock-on-mig-failure.patch,
759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch,
c2dc6698-fix-deadlock-obtaining-hostname.patch,
c391e07e-libxl-clock-settings.patch,
ef71caea-libxl-memalign.patch,
suse-apparmor-signal.patch
OBS-URL: https://build.opensuse.org/request/show/583090
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=674
2018-03-05 18:46:32 +01:00
|
|
|
===================================================================
|
2019-06-03 22:11:36 +02:00
|
|
|
--- libvirt-5.4.0.orig/src/util/vircgroup.c
|
|
|
|
+++ libvirt-5.4.0/src/util/vircgroup.c
|
2019-05-08 21:35:37 +02:00
|
|
|
@@ -2774,6 +2774,44 @@ virCgroupControllerAvailable(int control
|
2018-02-09 17:35:42 +01:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
+int
|
|
|
|
+virCgroupGetStatsCpu(virCgroupPtr cgroup,
|
|
|
|
+ virDomainStatsRecordPtr record,
|
|
|
|
+ int *maxparams)
|
|
|
|
+{
|
|
|
|
+ unsigned long long cpu_time = 0;
|
|
|
|
+ unsigned long long user_time = 0;
|
|
|
|
+ unsigned long long sys_time = 0;
|
|
|
|
+ int err = 0;
|
|
|
|
+
|
|
|
|
+ if (!cgroup)
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ err = virCgroupGetCpuacctUsage(cgroup, &cpu_time);
|
|
|
|
+ if (!err && virTypedParamsAddULLong(&record->params,
|
|
|
|
+ &record->nparams,
|
|
|
|
+ maxparams,
|
|
|
|
+ "cpu.time",
|
|
|
|
+ cpu_time) < 0)
|
|
|
|
+ return -1;
|
|
|
|
+
|
|
|
|
+ err = virCgroupGetCpuacctStat(cgroup, &user_time, &sys_time);
|
|
|
|
+ if (!err && virTypedParamsAddULLong(&record->params,
|
|
|
|
+ &record->nparams,
|
|
|
|
+ maxparams,
|
|
|
|
+ "cpu.user",
|
|
|
|
+ user_time) < 0)
|
|
|
|
+ return -1;
|
|
|
|
+ if (!err && virTypedParamsAddULLong(&record->params,
|
|
|
|
+ &record->nparams,
|
|
|
|
+ maxparams,
|
|
|
|
+ "cpu.system",
|
|
|
|
+ sys_time) < 0)
|
|
|
|
+ return -1;
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
+}
|
|
|
|
+
|
2018-10-03 22:24:42 +02:00
|
|
|
#else /* !__linux__ */
|
2018-02-09 17:35:42 +01:00
|
|
|
|
|
|
|
bool
|
2019-05-08 21:35:37 +02:00
|
|
|
@@ -2783,6 +2821,15 @@ virCgroupAvailable(void)
|
2018-02-09 17:35:42 +01:00
|
|
|
}
|
2018-10-03 22:24:42 +02:00
|
|
|
|
|
|
|
|
2018-02-09 17:35:42 +01:00
|
|
|
+int
|
|
|
|
+virCgroupGetStatsCpu(virCgroupPtr cgroup,
|
|
|
|
+ virDomainStatsRecordPtr record,
|
|
|
|
+ int *maxparams)
|
|
|
|
+{
|
|
|
|
+ return 0;
|
|
|
|
+}
|
2018-10-03 22:24:42 +02:00
|
|
|
+
|
|
|
|
+
|
|
|
|
int
|
|
|
|
virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED,
|
|
|
|
bool create ATTRIBUTE_UNUSED,
|
2019-06-03 22:11:36 +02:00
|
|
|
Index: libvirt-5.4.0/src/util/vircgroup.h
|
Accepting request 583090 from home:jfehlig:branches:Virtualization
- Update to libvirt 4.1.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch,
68eed56b-conf-smbios-oem-strings.patch,
76977061-qemu-smbios-oem-strings.patch,
0c710a37-libxl-resume-lock-on-mig-failure.patch,
759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch,
c2dc6698-fix-deadlock-obtaining-hostname.patch,
c391e07e-libxl-clock-settings.patch,
ef71caea-libxl-memalign.patch,
suse-apparmor-signal.patch
OBS-URL: https://build.opensuse.org/request/show/583090
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=674
2018-03-05 18:46:32 +01:00
|
|
|
===================================================================
|
2019-06-03 22:11:36 +02:00
|
|
|
--- libvirt-5.4.0.orig/src/util/vircgroup.h
|
|
|
|
+++ libvirt-5.4.0/src/util/vircgroup.h
|
2019-05-08 21:35:37 +02:00
|
|
|
@@ -285,4 +285,9 @@ int virCgroupSetOwner(virCgroupPtr cgrou
|
2018-02-09 17:35:42 +01:00
|
|
|
int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller);
|
|
|
|
|
|
|
|
bool virCgroupControllerAvailable(int controller);
|
|
|
|
+
|
|
|
|
+int virCgroupGetStatsCpu(virCgroupPtr cgroup,
|
|
|
|
+ virDomainStatsRecordPtr record,
|
|
|
|
+ int *maxparams);
|
2018-08-07 00:52:48 +02:00
|
|
|
+
|
2019-01-16 00:46:12 +01:00
|
|
|
#endif /* LIBVIRT_VIRCGROUP_H */
|
2019-06-03 22:11:36 +02:00
|
|
|
Index: libvirt-5.4.0/src/conf/Makefile.inc.am
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
===================================================================
|
2019-06-03 22:11:36 +02:00
|
|
|
--- libvirt-5.4.0.orig/src/conf/Makefile.inc.am
|
|
|
|
+++ libvirt-5.4.0/src/conf/Makefile.inc.am
|
2019-05-08 21:35:37 +02:00
|
|
|
@@ -22,6 +22,8 @@ DOMAIN_CONF_SOURCES = \
|
Accepting request 593871 from home:jfehlig:branches:Virtualization
- util: improvements in error handling
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
bsc#1080957
- Update to libvirt 4.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
6b3d716e-keycodemap-py3.patch,
33c6eb96-fix-libvirtd-reload-deadlock.patch,
464889ff-rpc-aquire-ref-dispatch.patch,
c6f1d519-rpc-simplify-dispatch.patch,
06e7ebb6-rpc-invoke-dispatch-unlocked.patch,
86cae503-rpc-fix-pre-exec.patch,
eefabb38-rpc-virtlockd-virtlogd-single-thread.patch,
fbf31e1a-CVE-2018-1064.patch,
fb327ac2-virtlockd-admin-socket.patch,
64370c4b-libxl-MigrateBegin.patch,
99486799-libxl-MigrateConfirm.patch,
f5eacf2a-libxl-MigratePerform.patch,
4e6fcdb6-libxl-libxlDomObjFromDomain-cleanup.patch,
fe51dbda-libxl-use-FindByRef.patch,
60b3fcd9-libxl-MigratePrepare.patch,
3c89868c-libxl-lock-after-ListRemove.patch,
13e81fc6-libxl-EndJob-on-error.patch,
594b8b99-libxl-DefineXMLFlags-API-pattern.patch,
c66e344e-libxl-dont-deref-NULL.patch,
83edaf44-libxl-dont-hardcode-sched-weight.patch,
apibuild-py3.patch
OBS-URL: https://build.opensuse.org/request/show/593871
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=683
2018-04-05 23:47:55 +02:00
|
|
|
conf/domain_audit.h \
|
|
|
|
conf/domain_nwfilter.c \
|
|
|
|
conf/domain_nwfilter.h \
|
|
|
|
+ conf/domain_stats.c \
|
|
|
|
+ conf/domain_stats.h \
|
|
|
|
conf/virsavecookie.c \
|
|
|
|
conf/virsavecookie.h \
|
Accepting request 692393 from home:jfehlig:branches:Virtualization
- CVE-2019-3886: disallow virDomainGetHostname and virDomainGetTime
for read-only connections and users
CVE-2019-3886-api.patch, CVE-2019-3886-remote.patch
bsc#1131595
- spec: BuildRequires rpcgen since CVE-2019-3886-remote.patch
touches remote_protocol.x
- Update to libvirt 5.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
4ec3cf9a-apparmor-rules.patch,
f38ef0fa-no-RDMA-check.patch,
411cdaf8-apparmor-check-profile-name.patch,
696239ba-qemu-fix-query-cpus-fast.patch,
09eb1ae0-conf-add-xenbus-controller.patch,
fb059757-libxl-add-xenbus-controller.patch,
ec5a1191-libxl-support-max-grant-frames.patch,
5a64c202-xenconfig-support-max-grant-frames.patch
- Added patches:
ff376c62-tests-fix-mocking-stat-lstat.patch,
mprivozn-test-fix-proposal.patch
OBS-URL: https://build.opensuse.org/request/show/692393
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=745
2019-04-09 00:27:41 +02:00
|
|
|
conf/moment_conf.c \
|