[libvirt] [PATCH v1 00/32] use GNU C's cleanup attribute in src/util (batch III)
by Sukrit Bhatnagar
This third series of patches also modifies a few files in src/util
to use VIR_AUTOFREE and VIR_AUTOPTR for automatic freeing of memory
and get rid of some VIR_FREE macro invocations and *Free function
calls.
Sukrit Bhatnagar (32):
util: iscsi: use VIR_AUTOFREE instead of VIR_FREE for scalar types
util: iscsi: use VIR_AUTOPTR for aggregate types
util: netdevbridge: use VIR_AUTOFREE instead of VIR_FREE for scalar
types
util: macaddr: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC
util: netdev: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC
util: netdev: use VIR_AUTOFREE instead of VIR_FREE for scalar types
util: netdev: use VIR_AUTOPTR for aggregate types
util: socketaddr: define cleanup function using
VIR_DEFINE_AUTOPTR_FUNC
util: socketaddr: use VIR_AUTOFREE instead of VIR_FREE for scalar
types
util: socketaddr: use VIR_AUTOPTR for aggregate types
util: netdevip: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC
util: netdevip: use VIR_AUTOFREE instead of VIR_FREE for scalar types
util: netdevip: use VIR_AUTOPTR for aggregate types
util: netdevmacvlan: define cleanup function using
VIR_DEFINE_AUTOPTR_FUNC
util: netdevmacvlan: use VIR_AUTOFREE instead of VIR_FREE for scalar
types
util: netdevmacvlan: use VIR_AUTOPTR for aggregate types
util: netdevopenvswitch: use VIR_AUTOFREE instead of VIR_FREE for
scalar types
util: netdevopenvswitch: use VIR_AUTOPTR for aggregate types
util: netdevtap: use VIR_AUTOFREE instead of VIR_FREE for scalar types
util: netdevveth: use VIR_AUTOFREE instead of VIR_FREE for scalar
types
util: netdevveth: use VIR_AUTOPTR for aggregate types
util: netlink: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC
util: netlink: use VIR_AUTOPTR for aggregate types
util: numa: use VIR_AUTOFREE instead of VIR_FREE for scalar types
util: numa: use VIR_AUTOPTR for aggregate types
util: perf: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC
util: perf: use VIR_AUTOFREE instead of VIR_FREE for scalar types
util: pidfile: use VIR_AUTOFREE instead of VIR_FREE for scalar types
util: process: use VIR_AUTOFREE instead of VIR_FREE for scalar types
util: process: use VIR_AUTOPTR for aggregate types
util: qemu: use VIR_AUTOFREE instead of VIR_FREE for scalar types
util: qemu: use VIR_AUTOPTR for aggregate types
src/util/viriscsi.c | 99 ++++------
src/util/virmacaddr.c | 6 +
src/util/virmacaddr.h | 4 +
src/util/virnetdev.c | 412 +++++++++++++++-------------------------
src/util/virnetdev.h | 4 +
src/util/virnetdevbridge.c | 45 ++---
src/util/virnetdevip.c | 157 ++++++---------
src/util/virnetdevip.h | 4 +
src/util/virnetdevmacvlan.c | 41 ++--
src/util/virnetdevopenvswitch.c | 131 +++++--------
src/util/virnetdevtap.c | 11 +-
src/util/virnetdevveth.c | 33 ++--
src/util/virnetlink.c | 62 +++---
src/util/virnuma.c | 107 ++++-------
src/util/virperf.c | 20 +-
src/util/virperf.h | 8 +-
src/util/virpidfile.c | 185 ++++++------------
src/util/virprocess.c | 68 +++----
src/util/virqemu.c | 50 ++---
src/util/virsocketaddr.c | 113 +++++------
src/util/virsocketaddr.h | 9 +-
21 files changed, 610 insertions(+), 959 deletions(-)
--
1.8.3.1
6 years, 4 months
[libvirt] [PATCH] qemu: emit error when trying to update blkiotune group_name in qemuDomainChangeDiskLive
by Katerina Koukiou
All rest of blkiotune parameters are not updatable through UpdateDeviceFlags API.
https://bugzilla.redhat.com/show_bug.cgi?id=1601677
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
The BZ was requesting to add support for updating the group_name for
blkdeviotune here, though, all the rest of blkdeviotune elements are not
updatable though UpdateDeviceFlags API. I think emmiting error and
keeping all blkiodevtune parameters updatable in a consistent way is the
right way to go.
src/qemu/qemu_domain.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index de056272e8..0aa440e0b5 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8791,6 +8791,9 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk,
CHECK_EQ(blkdeviotune.size_iops_sec,
"blkdeviotune size_iops_sec",
true);
+ CHECK_EQ(blkdeviotune.group_name,
+ "blkdeviotune group_name",
+ true);
if (disk->serial && STRNEQ_NULLABLE(disk->serial, orig_disk->serial)) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
--
2.17.1
6 years, 4 months
[libvirt] [PATCH v3 0/4] iscsi-direct: first part
by clem＠lse.epita.fr
From: Clementine Hayat <clem(a)lse.epita.fr>
Hello,
This is the implementation of the iscsi-direct backend storage pool
version 3.
v1: https://www.redhat.com/archives/libvir-list/2018-July/msg00918.html
v2: https://www.redhat.com/archives/libvir-list/2018-July/msg01528.html
Best Regards,
--
Clementine Hayat
Clementine Hayat (4):
configure: Introduce libiscsi in build system
storage: Introduce iscsi_direct pool type
storage: Implement iscsi_direct pool backend
news: add storage pool iscsi-direct
configure.ac | 9 +-
docs/news.xml | 9 +
docs/schemas/storagepool.rng | 35 ++
docs/storage.html.in | 30 ++
m4/virt-libiscsi.m4 | 30 ++
m4/virt-storage-iscsi-direct.m4 | 44 ++
src/conf/domain_conf.c | 1 +
src/conf/storage_conf.c | 22 +-
src/conf/storage_conf.h | 1 +
src/conf/virstorageobj.c | 2 +
src/storage/Makefile.inc.am | 24 +
src/storage/storage_backend.c | 6 +
src/storage/storage_backend_iscsi_direct.c | 452 ++++++++++++++++++
src/storage/storage_backend_iscsi_direct.h | 6 +
src/storage/storage_driver.c | 1 +
.../pool-iscsi-direct-auth.xml | 14 +
.../pool-iscsi-direct.xml | 12 +
.../pool-iscsi-direct-auth.xml | 17 +
.../pool-iscsi-direct.xml | 14 +
tests/storagepoolxml2xmltest.c | 2 +
tools/virsh-pool.c | 3 +
21 files changed, 728 insertions(+), 6 deletions(-)
create mode 100644 m4/virt-libiscsi.m4
create mode 100644 m4/virt-storage-iscsi-direct.m4
create mode 100644 src/storage/storage_backend_iscsi_direct.c
create mode 100644 src/storage/storage_backend_iscsi_direct.h
create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-direct-auth.xml
create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-direct.xml
create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-direct-auth.xml
create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-direct.xml
--
2.18.0
6 years, 4 months
[libvirt] [RFC] secdrivers remembering original labels
by Michal Privoznik
Dear list,
we have this very old bug [1] that I just keep pushing in front of me. I
made several attempts to fix it. However, none of them made into the
tree. I guess it's time to have discussion what to do about it. IIRC,
the algorithm that I implemented last was to keep original label in
XATTRs (among with some ref counter) and the last one to restore the
label will look there and find the original label. There was a problem
with two libvirtds fighting over a file on shared FS.
So I guess my question is can we come up with a design that would work?
Or at least work to the extent that we're satisfied with?
Personally, I like the XATTRs approach. And to resolve the NFS race we
can invent yet another lockspace to guard labelling - I also have a bug
for that [2] (although, I'm not that familiar with lockspaces). I guess
doing disk metadata locking is not going to be trivial, is it?
Michal
1: https://bugzilla.redhat.com/show_bug.cgi?id=547546
2: https://bugzilla.redhat.com/show_bug.cgi?id=1524792
6 years, 4 months
[libvirt] [PATCH 0/3] conf: standardize naming
by Anya Harter
on vir*ObjListExport call stack
Anya Harter (3):
conf: rename structs used by Export function
conf: rename Export Callback functions
conf: rename Match functions
src/conf/virinterfaceobj.c | 10 +++++-----
src/conf/virnetworkobj.c | 16 ++++++++--------
src/conf/virnodedeviceobj.c | 4 ++--
src/conf/virsecretobj.c | 10 +++++-----
src/conf/virstorageobj.c | 24 ++++++++++++------------
5 files changed, 32 insertions(+), 32 deletions(-)
--
2.17.1
6 years, 4 months
[libvirt] [PATCH for-3.1] s390x: remove 's390-squash-mcss' option
by Cornelia Huck
This option has been deprecated for two releases; remove it.
Signed-off-by: Cornelia Huck <cohuck(a)redhat.com>
---
hw/s390x/3270-ccw.c | 2 +-
hw/s390x/css-bridge.c | 1 -
hw/s390x/css.c | 6 ++----
hw/s390x/s390-ccw.c | 2 +-
hw/s390x/s390-virtio-ccw.c | 37 ++-----------------------------------
hw/s390x/virtio-ccw.c | 2 +-
include/hw/s390x/css-bridge.h | 1 -
include/hw/s390x/css.h | 9 +++------
include/hw/s390x/s390-virtio-ccw.h | 1 -
qemu-deprecated.texi | 8 --------
qemu-options.hx | 10 ----------
target/s390x/cpu.c | 10 ----------
target/s390x/cpu.h | 1 -
13 files changed, 10 insertions(+), 80 deletions(-)
diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c
index 3af13ea027..cf58b81fc0 100644
--- a/hw/s390x/3270-ccw.c
+++ b/hw/s390x/3270-ccw.c
@@ -104,7 +104,7 @@ static void emulated_ccw_3270_realize(DeviceState *ds, Error **errp)
SubchDev *sch;
Error *err = NULL;
- sch = css_create_sch(cdev->devno, cbus->squash_mcss, errp);
+ sch = css_create_sch(cdev->devno, errp);
if (!sch) {
return;
}
diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c
index a02d708239..1bd6c8b458 100644
--- a/hw/s390x/css-bridge.c
+++ b/hw/s390x/css-bridge.c
@@ -106,7 +106,6 @@ VirtualCssBus *virtual_css_bus_init(void)
/* Create bus on bridge device */
bus = qbus_create(TYPE_VIRTUAL_CSS_BUS, dev, "virtual-css");
cbus = VIRTUAL_CSS_BUS(bus);
- cbus->squash_mcss = s390_get_squash_mcss();
/* Enable hotplugging */
qbus_set_hotplug_handler(bus, dev, &error_abort);
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 5424ea4562..5a9fe45ce8 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -2359,15 +2359,13 @@ const PropertyInfo css_devid_ro_propinfo = {
.get = get_css_devid,
};
-SubchDev *css_create_sch(CssDevId bus_id, bool squash_mcss, Error **errp)
+SubchDev *css_create_sch(CssDevId bus_id, Error **errp)
{
uint16_t schid = 0;
SubchDev *sch;
if (bus_id.valid) {
- if (squash_mcss) {
- bus_id.cssid = channel_subsys.default_cssid;
- } else if (!channel_subsys.css[bus_id.cssid]) {
+ if (!channel_subsys.css[bus_id.cssid]) {
css_create_css_image(bus_id.cssid, false);
}
diff --git a/hw/s390x/s390-ccw.c b/hw/s390x/s390-ccw.c
index 214c940593..d1280bf631 100644
--- a/hw/s390x/s390-ccw.c
+++ b/hw/s390x/s390-ccw.c
@@ -78,7 +78,7 @@ static void s390_ccw_realize(S390CCWDevice *cdev, char *sysfsdev, Error **errp)
goto out_err_propagate;
}
- sch = css_create_sch(ccw_dev->devno, cbus->squash_mcss, &err);
+ sch = css_create_sch(ccw_dev->devno, &err);
if (!sch) {
goto out_mdevid_free;
}
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 7983185d04..380a41d806 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -282,19 +282,8 @@ static void ccw_init(MachineState *machine)
virtio_ccw_register_hcalls();
s390_enable_css_support(s390_cpu_addr2state(0));
- /*
- * Non mcss-e enabled guests only see the devices from the default
- * css, which is determined by the value of the squash_mcss property.
- */
- if (css_bus->squash_mcss) {
- ret = css_create_css_image(0, true);
- } else {
- ret = css_create_css_image(VIRTUAL_CSSID, true);
- }
- if (qemu_opt_get(qemu_get_machine_opts(), "s390-squash-mcss")) {
- warn_report("The machine property 's390-squash-mcss' is deprecated"
- " (obsoleted by lifting the cssid restrictions).");
- }
+
+ ret = css_create_css_image(VIRTUAL_CSSID, true);
assert(ret == 0);
if (css_migration_enabled()) {
@@ -575,21 +564,6 @@ static void machine_set_loadparm(Object *obj, const char *val, Error **errp)
ms->loadparm[i] = ' '; /* pad right with spaces */
}
}
-static inline bool machine_get_squash_mcss(Object *obj, Error **errp)
-{
- S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
-
- return ms->s390_squash_mcss;
-}
-
-static inline void machine_set_squash_mcss(Object *obj, bool value,
- Error **errp)
-{
- S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
-
- ms->s390_squash_mcss = value;
-}
-
static inline void s390_machine_initfn(Object *obj)
{
object_property_add_bool(obj, "aes-key-wrap",
@@ -614,13 +588,6 @@ static inline void s390_machine_initfn(Object *obj)
" to upper case) to pass to machine loader, boot manager,"
" and guest kernel",
NULL);
- object_property_add_bool(obj, "s390-squash-mcss",
- machine_get_squash_mcss,
- machine_set_squash_mcss, NULL);
- object_property_set_description(obj, "s390-squash-mcss", "(deprecated) "
- "enable/disable squashing subchannels into the default css",
- NULL);
- object_property_set_bool(obj, false, "s390-squash-mcss", NULL);
}
static const TypeInfo ccw_machine_info = {
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 7ddb378d52..3156e8d6e1 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -700,7 +700,7 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *dev, Error **errp)
SubchDev *sch;
Error *err = NULL;
- sch = css_create_sch(ccw_dev->devno, cbus->squash_mcss, errp);
+ sch = css_create_sch(ccw_dev->devno, errp);
if (!sch) {
return;
}
diff --git a/include/hw/s390x/css-bridge.h b/include/hw/s390x/css-bridge.h
index cf0860432a..5a0203be5f 100644
--- a/include/hw/s390x/css-bridge.h
+++ b/include/hw/s390x/css-bridge.h
@@ -28,7 +28,6 @@ typedef struct VirtualCssBridge {
/* virtual css bus type */
typedef struct VirtualCssBus {
BusState parent_obj;
- bool squash_mcss;
} VirtualCssBus;
#define TYPE_VIRTUAL_CSS_BUS "virtual-css-bus"
diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h
index 35facb47d2..9da5912921 100644
--- a/include/hw/s390x/css.h
+++ b/include/hw/s390x/css.h
@@ -266,11 +266,8 @@ extern const PropertyInfo css_devid_ro_propinfo;
/**
* Create a subchannel for the given bus id.
*
- * If @p bus_id is valid, and @p squash_mcss is true, verify that it is
- * not already in use in the default css, and find a free devno from the
- * default css image for it.
- * If @p bus_id is valid, and @p squash_mcss is false, verify that it is
- * not already in use, and find a free devno for it.
+ * If @p bus_id is valid, verify that it is not already in use, and find a
+ * free devno for it.
* If @p bus_id is not valid find a free subchannel id and device number
* across all subchannel sets and all css images starting from the default
* css image.
@@ -282,7 +279,7 @@ extern const PropertyInfo css_devid_ro_propinfo;
* The caller becomes owner of the returned subchannel structure and
* is responsible for unregistering and freeing it.
*/
-SubchDev *css_create_sch(CssDevId bus_id, bool squash_mcss, Error **errp);
+SubchDev *css_create_sch(CssDevId bus_id, Error **errp);
/** Turn on css migration */
void css_register_vmstate(void);
diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h
index ab88d49d10..e9c4f4182b 100644
--- a/include/hw/s390x/s390-virtio-ccw.h
+++ b/include/hw/s390x/s390-virtio-ccw.h
@@ -29,7 +29,6 @@ typedef struct S390CcwMachineState {
bool aes_key_wrap;
bool dea_key_wrap;
uint8_t loadparm[8];
- bool s390_squash_mcss;
} S390CcwMachineState;
typedef struct S390CcwMachineClass {
diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
index 9920a85adc..09f7b22fb1 100644
--- a/qemu-deprecated.texi
+++ b/qemu-deprecated.texi
@@ -126,14 +126,6 @@ The ``-nodefconfig`` argument is a synonym for ``-no-user-config``.
The @option{--balloon virtio} argument has been superseded by
@option{--device virtio-balloon}.
-@subsection -machine s390-squash-mcss=on|off (since 2.12.0)
-
-The ``s390-squash-mcss=on`` property has been obsoleted by allowing the
-cssid to be chosen freely. Instead of squashing subchannels into the
-default channel subsystem image for guests that do not support multiple
-channel subsystems, all devices can be put into the default channel
-subsystem image.
-
@subsection -fsdev handle (since 2.12.0)
The ``handle'' fsdev backend does not support symlinks and causes the 9p
diff --git a/qemu-options.hx b/qemu-options.hx
index b1bf0f485f..e57cec96a5 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -43,7 +43,6 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \
" suppress-vmdesc=on|off disables self-describing migration (default=off)\n"
" nvdimm=on|off controls NVDIMM support (default=off)\n"
" enforce-config-section=on|off enforce configuration section migration (default=off)\n"
- " s390-squash-mcss=on|off (deprecated) controls support for squashing into default css (default=off)\n"
" memory-encryption=@var{} memory encryption object to use (default=none)\n",
QEMU_ARCH_ALL)
STEXI
@@ -96,15 +95,6 @@ controls whether DEA wrapping keys will be created to allow
execution of DEA cryptographic functions. The default is on.
@item nvdimm=on|off
Enables or disables NVDIMM support. The default is off.
-@item s390-squash-mcss=on|off
-Enables or disables squashing subchannels into the default css.
-The default is off.
-NOTE: This property is deprecated and will be removed in future releases.
-The ``s390-squash-mcss=on`` property has been obsoleted by allowing the
-cssid to be chosen freely. Instead of squashing subchannels into the
-default channel subsystem image for guests that do not support multiple
-channel subsystems, all devices can be put into the default channel
-subsystem image.
@item enforce-config-section=on|off
If @option{enforce-config-section} is set to @var{on}, force migration
code to send configuration section even if the machine-type sets the
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 271c5ce652..8ed4823d6e 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -421,16 +421,6 @@ void s390_crypto_reset(void)
}
}
-bool s390_get_squash_mcss(void)
-{
- if (object_property_get_bool(OBJECT(qdev_get_machine()), "s390-squash-mcss",
- NULL)) {
- return true;
- }
-
- return false;
-}
-
void s390_enable_css_support(S390CPU *cpu)
{
if (kvm_enabled()) {
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 2c3dd2d189..86b66dfeac 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -713,7 +713,6 @@ static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg)
/* cpu.c */
void s390_crypto_reset(void);
-bool s390_get_squash_mcss(void);
int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit);
void s390_cmma_reset(void);
void s390_enable_css_support(S390CPU *cpu);
--
2.14.4
6 years, 4 months
[libvirt] [jenkins-ci PATCH 0/8] lcitool: Cleanups and improvements
by Andrea Bolognani
This series makes the guests/ directory less crowded by moving
a bunch of files to subdirectories, enhances the lcitool script
so that it works when called from any directory, and introduces
the ability to skip installation of build dependencies for
projects you don't care about. Some of these changes pave the
way for introducing [secret feature redacted] later on.
Andrea Bolognani (8):
lcitool: Make the script location-independent
lcitool: Use JSON to pass extra-vars
lcitool: Pass base and playbook_base to Ansible
guests: Move update playbook and related resources
guests: Drop install_config from inventory
guests: Move install configs
lcitool: Allow installing a subset of build dependencies
guests: Update documentation
guests/README.markdown | 38 ++++++--
guests/{ => configs}/kickstart.cfg | 0
guests/{ => configs}/preseed.cfg | 0
guests/host_vars/libvirt-centos-7/install.yml | 1 -
guests/host_vars/libvirt-debian-8/install.yml | 1 -
guests/host_vars/libvirt-debian-9/install.yml | 1 -
.../host_vars/libvirt-debian-sid/install.yml | 1 -
.../host_vars/libvirt-fedora-27/install.yml | 1 -
.../host_vars/libvirt-fedora-28/install.yml | 1 -
.../libvirt-fedora-rawhide/install.yml | 1 -
.../host_vars/libvirt-ubuntu-16/install.yml | 1 -
.../host_vars/libvirt-ubuntu-18/install.yml | 1 -
guests/lcitool | 96 ++++++++++++++-----
.../{site.yml => playbooks/update/main.yml} | 30 +++---
guests/{ => playbooks/update}/tasks/base.yml | 6 +-
.../update}/tasks/bootloader.yml | 0
.../update}/tasks/bootstrap.yml | 0
.../{ => playbooks/update}/tasks/jenkins.yml | 4 +-
.../{ => playbooks/update}/tasks/kludges.yml | 0
.../{ => playbooks/update}/tasks/packages.yml | 2 +-
guests/{ => playbooks/update}/tasks/paths.yml | 0
.../{ => playbooks/update}/tasks/services.yml | 0
guests/{ => playbooks/update}/tasks/users.yml | 4 +-
.../update}/templates/bash_profile.j2 | 0
.../update}/templates/bashrc.j2 | 0
.../update}/templates/ccache.conf.j2 | 0
.../fedora-rawhide-kernel-nodebug.repo.j2 | 0
.../update}/templates/jenkins.service.j2 | 0
.../templates/jessie-backports.preferences.j2 | 0
.../templates/jessie-backports.sources.j2 | 0
30 files changed, 128 insertions(+), 61 deletions(-)
rename guests/{ => configs}/kickstart.cfg (100%)
rename guests/{ => configs}/preseed.cfg (100%)
rename guests/{site.yml => playbooks/update/main.yml} (52%)
rename guests/{ => playbooks/update}/tasks/base.yml (92%)
rename guests/{ => playbooks/update}/tasks/bootloader.yml (100%)
rename guests/{ => playbooks/update}/tasks/bootstrap.yml (100%)
rename guests/{ => playbooks/update}/tasks/jenkins.yml (92%)
rename guests/{ => playbooks/update}/tasks/kludges.yml (100%)
rename guests/{ => playbooks/update}/tasks/packages.yml (96%)
rename guests/{ => playbooks/update}/tasks/paths.yml (100%)
rename guests/{ => playbooks/update}/tasks/services.yml (100%)
rename guests/{ => playbooks/update}/tasks/users.yml (95%)
rename guests/{ => playbooks/update}/templates/bash_profile.j2 (100%)
rename guests/{ => playbooks/update}/templates/bashrc.j2 (100%)
rename guests/{ => playbooks/update}/templates/ccache.conf.j2 (100%)
rename guests/{ => playbooks/update}/templates/fedora-rawhide-kernel-nodebug.repo.j2 (100%)
rename guests/{ => playbooks/update}/templates/jenkins.service.j2 (100%)
rename guests/{ => playbooks/update}/templates/jessie-backports.preferences.j2 (100%)
rename guests/{ => playbooks/update}/templates/jessie-backports.sources.j2 (100%)
--
2.17.1
6 years, 4 months
[libvirt] [PATCH for 4.6.0] tests: qemucapsprobe: Fix output after swithching to jansson
by Peter Krempa
Jansson does not put a newline at the end of formatted JSON strings.
This breaks the qemucapsprobe utility as we need to keep the spacing so
that tests work. Add an explicit newline.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemucapsprobemock.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c
index 5936975505..049b16273a 100644
--- a/tests/qemucapsprobemock.c
+++ b/tests/qemucapsprobemock.c
@@ -76,6 +76,7 @@ qemuMonitorSend(qemuMonitorPtr mon,
printLineSkipEmpty("\n", stdout);
printLineSkipEmpty(reformatted, stdout);
+ printLineSkipEmpty("\n", stdout);
VIR_FREE(reformatted);
return realQemuMonitorSend(mon, msg);
@@ -116,6 +117,7 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon,
printLineSkipEmpty("\n", stdout);
printLineSkipEmpty(json, stdout);
+ printLineSkipEmpty("\n", stdout);
}
cleanup:
--
2.16.2
6 years, 4 months
[libvirt] [jenkins-ci PATCH] lcitool: Update OS when building Docker images
by Andrea Bolognani
The last build of the Fedora Rawhide Docker image failed
with
Transaction check error:
file /usr/lib64/libgdbm_compat.so.4.0.0 from install
of gdbm-libs-1:1.16-1.fc29.x86_64 conflicts with file
from package gdbm-1:1.14.1-3.fc28.x86_64
caused by the gdbm package having recently been split.
Especially with fast-moving distribution such as Fedora
Rawhide and Debian Sid, we can't rely on the base OS not
changing over time, so merely installing the packages we
need on top of that is not enough.
Additionally, updating the OS brings the Docker images
closer to the guests running on CentOS CI, which are
updated daily.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/lcitool | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/guests/lcitool b/guests/lcitool
index 22b08dd..33c1afe 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -478,13 +478,15 @@ class Application:
if package_format == "deb":
sys.stdout.write(textwrap.dedent("""
RUN apt-get update && \\
+ apt-get dist-upgrade -y && \\
apt-get install -y ${PACKAGES} && \\
apt-get autoremove -y && \\
apt-get autoclean -y
"""))
elif package_format == "rpm":
sys.stdout.write(textwrap.dedent("""
- RUN yum install -y ${PACKAGES} && \\
+ RUN yum update -y && \\
+ yum install -y ${PACKAGES} && \\
yum autoremove -y && \\
yum clean all -y
"""))
--
2.17.1
6 years, 4 months
