date:20180222

[libvirt] [PATCH] libxl: don't hardcode scheduler weight

2018-02-22 Thread Jim Fehlig

Long ago in commit dfa1e1dd53 the scheduler weight was accidentally
hardcoded to 1000. Weight is a setting with no unit since it is
relative to the weight of other domains. If no weight is specified,
libxl defaults to 256.

Instead of hardcoding the weight to 1000, honor any  specified
in . libvirt's notion of shares is synonomous to libxl's
scheduler weight setting. If shares is unspecified, defer default
weight setting to libxl.

Removing the hardcoded weight required some test fixup. While at it,
add an explicit test for  conversion to scheduler weight.

Signed-off-by: Jim Fehlig 
---

Honoring  specified by the user is certainly desirable,
but I'm not sure about changing the default weight. One problematic
scenario that came to mind: Several domains started by pre-patch
libvirtd with weight=1000, update libvirtd with patch, start more
domains with weight=256. The pre-patch domains unknowingly have
a weight nearly 4 times that of post-patch domains.

 src/libxl/libxl_conf.c |  4 +-
 tests/libxlxml2domconfigdata/basic-hvm.json|  2 +-
 tests/libxlxml2domconfigdata/basic-pv.json |  2 +-
 tests/libxlxml2domconfigdata/cpu-shares-hvm.json   | 89 ++
 tests/libxlxml2domconfigdata/cpu-shares-hvm.xml| 39 ++
 tests/libxlxml2domconfigdata/moredevs-hvm.json |  2 +-
 tests/libxlxml2domconfigdata/multiple-ip.json  |  2 +-
 .../libxlxml2domconfigdata/variable-clock-hvm.json |  2 +-
 tests/libxlxml2domconfigdata/vnuma-hvm.json|  2 +-
 tests/libxlxml2domconfigtest.c |  1 +
 10 files changed, 138 insertions(+), 7 deletions(-)

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index dcd46873c..e40145cfa 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -366,7 +366,9 @@ libxlMakeDomBuildInfo(virDomainDefPtr def,
 }
 }
 
-b_info->sched_params.weight = 1000;
+if (def->cputune.sharesSpecified)
+b_info->sched_params.weight = def->cputune.shares;
+
 b_info->max_memkb = virDomainDefGetMemoryInitial(def);
 b_info->target_memkb = def->mem.cur_balloon;
 if (hvm) {
diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json 
b/tests/libxlxml2domconfigdata/basic-hvm.json
index 6fa41f34f..ccd585385 100644
--- a/tests/libxlxml2domconfigdata/basic-hvm.json
+++ b/tests/libxlxml2domconfigdata/basic-hvm.json
@@ -19,7 +19,7 @@
 "device_model_version": "qemu_xen",
 "device_model": "/bin/true",
 "sched_params": {
-"weight": 1000
+
 },
 "type.hvm": {
 "pae": "True",
diff --git a/tests/libxlxml2domconfigdata/basic-pv.json 
b/tests/libxlxml2domconfigdata/basic-pv.json
index 7e1abd3d6..0f846daab 100644
--- a/tests/libxlxml2domconfigdata/basic-pv.json
+++ b/tests/libxlxml2domconfigdata/basic-pv.json
@@ -15,7 +15,7 @@
 "max_memkb": 524288,
 "target_memkb": 524288,
 "sched_params": {
-"weight": 1000
+
 },
 "type.pv": {
 "bootloader": "pygrub"
diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json 
b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
new file mode 100644
index 0..2e647eada
--- /dev/null
+++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
@@ -0,0 +1,89 @@
+{
+"c_info": {
+"type": "hvm",
+"name": "test-hvm",
+"uuid": "2147d599-9cc6-c0dc-92ab-4064b5446e9b"
+},
+"b_info": {
+"max_vcpus": 4,
+"avail_vcpus": [
+0,
+1,
+2,
+3
+],
+"max_memkb": 1048576,
+"target_memkb": 1048576,
+"video_memkb": 8192,
+"shadow_memkb": 12288,
+"device_model_version": "qemu_xen",
+"device_model": "/bin/true",
+"sched_params": {
+"weight": 1500
+},
+"type.hvm": {
+"pae": "True",
+"apic": "True",
+"acpi": "True",
+"vga": {
+"kind": "cirrus"
+},
+"vnc": {
+"enable": "True",
+"listen": "0.0.0.0",
+"findunused": "False"
+},
+"sdl": {
+"enable": "False"
+},
+"spice": {
+
+},
+"boot": "c",
+"rdm": {
+
+}
+},
+"arch_arm": {
+
+}
+},
+"disks": [
+{
+"pdev_path": "/var/lib/xen/images/test-hvm.img",
+"vdev": "hda",
+"backend": "qdisk",
+"format": "raw",
+"removable": 1,
+"readwrite": 1
+}
+],
+"nics": [
+{
+"devid": 0,
+"mac": "00:16:3e:66:12:b4",
+"bridge": "br0",
+"script": "/etc/xen/scripts/vif-bridge",
+"nictype": "vif_ioemu"
+}
+],
+"vfbs": [
+{
+   "devid": -1,
+

Re: [libvirt] [Libvirt-ci] Build failed in Jenkins: virt-manager-master-py3-check » libvirt-debian-9 #14

2018-02-22 Thread Cole Robinson

I'm confused why this is still failing. I set up a debian9 vm,
reproduced the issue which fails about 50% of the time, and verified
that commit 059fb7d0ba1d414db3db485903972b48c1dda629 fixes it
completely, or at least I can't reproduce. But this is still failing.

Weirdly though

On 02/22/2018 04:18 PM, c...@centos.org wrote:
> See 
> 
> 
> --
> Started by upstream project "virt-manager-master-py3-check" build number 14
> originally caused by:
>  Started by upstream project "virt-manager-master-py3-build" build number 14
>  originally caused by:
>   Started by an SCM change
> [EnvInject] - Loading node environment variables.
> Building remotely on libvirt-debian-9 (libvirt) in workspace 
> 
> [virt-manager-master] $ /bin/sh -xe /tmp/jenkins3940620727838286920.sh
> + MAKE=make
> + uname
> + unamestr=Linux
> + [ Linux = FreeBSD ]
> + export 
> PATH=/home/jenkins/build/libvirt/bin:/home/jenkins/build/libvirt/bin:/home/jenkins/build/libvirt/bin:/home/jenkins/build/libvirt/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
> + export 
> PYTHONPATH=/home/jenkins/build/libvirt/lib/python3.4/site-packages:/home/jenkins/build/libvirt/lib64/python3.4/site-packages:/home/jenkins/build/libvirt/lib/python3.5/site-packages:/home/jenkins/build/libvirt/lib64/python3.5/site-packages:/home/jenkins/build/libvirt/lib/python3.6/site-packages:/home/jenkins/build/libvirt/lib64/python3.6/site-packages:/home/jenkins/build/libvirt/lib/python3.7/site-packages:/home/jenkins/build/libvirt/lib64/python3.7/site-packages
> + python3 ./setup.py test
> running test
> ..F...s
> ==
> FAIL: testCLI0002virt_install_singleton_config_2 (tests.clitest.CLITests)
> --
> Traceback (most recent call last):
>   File 
> "
>  line 1110, in 
> return lambda s: cmdtemplate(s, cmd)
>   File 
> "
>  line 1109, in cmdtemplate
> _cmdobj.run(self)
>   File 
> "
>  line 277, in run
> tests.fail(err)

These line numbers don't match up with the line numbers in virt-manager
git master. Is there some chance it's using old code? it certainly seems
to be detecting new commits coming in which trigger builds, but I thing
something weird is going on here

- Cole

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] libxl: round memory values to next 1MiB increment

2018-02-22 Thread Jim Fehlig


On 02/21/2018 11:53 PM, Peter Krempa wrote:

On Wed, Feb 21, 2018 at 19:08:41 -0700, Jim Fehlig wrote:

libxl requires the memory sizes to be rounded to 1MiB increments.
Attempting to start a domain that violates this requirement will
fail with the marginally helpful error

2018-02-22 01:55:32.921+: xc: panic: xc_dom_boot.c:141: 
xc_dom_boot_mem_init: can't allocate low memory for domain: Out of memory
2018-02-22 01:55:32.921+: libxl: libxl_dom.c:671:libxl__build_dom: 
xc_dom_boot_mem_init failed: No such file or directory

Round the maximum and current memory values to the next 1MiB
increment when generating the libxl_domain_config object.

Signed-off-by: Jim Fehlig 
---

The memory values could also be adjusted in the post parse callback,
which might be better since the virDomainDef object would then reflect
the actual values given to libxl. In general, I often find myself


We do this in the qemu driver which has also rounding requirements and
adjust the live domain XML after it's copied when starting. Thus the
persistent definition is as provided by the user and the live XML
reflects the actual state.


Thanks. I've sent a V2 that sets the rounded values in the virDomainDef object. 
With that change I do indeed see the rounded values in live XML and original 
values in 'dumpxml --inactive'.


Regards,
Jim

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH V2] libxl: round memory values to next 1MiB increment

2018-02-22 Thread Jim Fehlig

libxl requires the memory sizes to be rounded to 1MiB increments.
Attempting to start a domain that violates this requirement will
fail with the marginally helpful error

2018-02-22 01:55:32.921+: xc: panic: xc_dom_boot.c:141: 
xc_dom_boot_mem_init: can't allocate low memory for domain: Out of memory
2018-02-22 01:55:32.921+: libxl: libxl_dom.c:671:libxl__build_dom: 
xc_dom_boot_mem_init failed: No such file or directory

Round the maximum and current memory values to the next 1MiB
increment when generating the libxl_domain_config object.

Signed-off-by: Jim Fehlig 
---

V2:
Set rounded memory values in virDomainDef object so they are correctly
reflected in the live config.

 src/libxl/libxl_conf.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 57cb4c0ad..d074edc9c 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -367,6 +367,10 @@ libxlMakeDomBuildInfo(virDomainDefPtr def,
 }
 
 b_info->sched_params.weight = 1000;
+/* Xen requires the memory sizes to be rounded to 1MiB increments */
+virDomainDefSetMemoryTotal(def,
+   VIR_ROUND_UP(virDomainDefGetMemoryInitial(def), 
1024));
+def->mem.cur_balloon = VIR_ROUND_UP(def->mem.cur_balloon, 1024);
 b_info->max_memkb = virDomainDefGetMemoryInitial(def);
 b_info->target_memkb = def->mem.cur_balloon;
 if (hvm) {
-- 
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH] travis: add a scenario for running make distcheck

2018-02-22 Thread Daniel P . Berrangé

Running "make distcheck" ensures that we have CLEANFILES and uninstall
rules setup correctly, as well as validating VPATH builds succeeed.

Signed-off-by: Daniel P. Berrangé 
---
 .travis.yml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 3f26a1..4bdf034829 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,13 @@ matrix:
   include:
 - compiler: gcc
   dist: precise
+# Special scenario to run distcheck, so we don't waste time duplicating
+# work in all the other scenarios. Doesn't work on precise due to the
+# CVE-2012-3386 flaw being present on that Ubuntu version
 - compiler: gcc
   dist: trusty
+  script:
+  - make -j3 distcheck
 - compiler: clang
   dist: precise
 - compiler: clang
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH] make: fix another VPATH bug impacting install of sysconf files

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---

Pushed as build fix

 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 2166e17dbe..8ceeda5756 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2833,7 +2833,7 @@ install-sysconfig:
for f in $(SYSCONF_FILES:%.sysconf=%) ; \
do \
  tgt=`basename $$f`; \
- $(INSTALL_SCRIPT) $$f.sysconf 
$(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$f.sysconf 
$(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
done
 
 uninstall-sysconfig:
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 0/3] qemu: Fix updating device with boot order

2018-02-22 Thread Jiri Denemark

Commit v3.7.0-14-gc57f3fd2f8 prevented adding a 
element to an inactive domain with global  element.
However, as a result of that change updating any device with boot order
would fail with 'boot order X is already used by another device', where
"another device" is in fact the device which is being updated.

To fix this we have to ignore the device which we're about to update
when checking for boot order conflicts.

https://bugzilla.redhat.com/show_bug.cgi?id=1546971

Jiri Denemark (3):
  lxc: Drop useless check in live device update
  Pass oldDev to virDomainDefCompatibleDevice on device update
  qemu: Fix updating device with boot order

 src/conf/domain_conf.c | 30 ++---
 src/conf/domain_conf.h |  3 ++-
 src/lxc/lxc_driver.c   | 18 +-
 src/qemu/qemu_driver.c | 51 --
 4 files changed, 75 insertions(+), 27 deletions(-)

-- 
2.16.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 1/3] lxc: Drop useless check in live device update

2018-02-22 Thread Jiri Denemark

Checking the new device definition makes little sense when lxc driver
does not support live device update at all.

Signed-off-by: Jiri Denemark 
---
 src/lxc/lxc_driver.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 3d5b2254f2..4c6f09a435 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -4939,9 +4939,6 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr dom,
 }
 
 if (flags & VIR_DOMAIN_AFFECT_LIVE) {
-if (virDomainDefCompatibleDevice(vm->def, dev_copy) < 0)
-goto endjob;
-
 virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("Unable to modify live devices"));
 
-- 
2.16.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 3/3] qemu: Fix updating device with boot order

2018-02-22 Thread Jiri Denemark

Commit v3.7.0-14-gc57f3fd2f8 prevented adding a 
element to an inactive domain with global  element.
However, as a result of that change updating any device with boot order
would fail with 'boot order X is already used by another device', where
"another device" is in fact the device which is being updated.

To fix this we have to ignore the device which we're about to update
when checking for boot order conflicts.

https://bugzilla.redhat.com/show_bug.cgi?id=1546971

Signed-off-by: Jiri Denemark 
---
 src/conf/domain_conf.c | 29 ++---
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c71c28e8d2..d96b012b98 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -27381,18 +27381,30 @@ virDomainDeviceIsUSB(virDomainDeviceDefPtr dev)
 return false;
 }
 
+
+typedef struct _virDomainCompatibleDeviceData virDomainCompatibleDeviceData;
+typedef virDomainCompatibleDeviceData *virDomainCompatibleDeviceDataPtr;
+struct _virDomainCompatibleDeviceData {
+virDomainDeviceInfoPtr newInfo;
+virDomainDeviceInfoPtr oldInfo;
+};
+
 static int
 virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def ATTRIBUTE_UNUSED,
   virDomainDeviceDefPtr device 
ATTRIBUTE_UNUSED,
   virDomainDeviceInfoPtr info,
   void *opaque)
 {
-virDomainDeviceInfoPtr newinfo = opaque;
+virDomainCompatibleDeviceDataPtr data = opaque;
 
-if (info->bootIndex == newinfo->bootIndex) {
+/* Ignore the device we're about to update */
+if (data->oldInfo == info)
+return 0;
+
+if (info->bootIndex == data->newInfo->bootIndex) {
 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("boot order %u is already used by another device"),
-   newinfo->bootIndex);
+   data->newInfo->bootIndex);
 return -1;
 }
 return 0;
@@ -27401,9 +27413,12 @@ virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def 
ATTRIBUTE_UNUSED,
 int
 virDomainDefCompatibleDevice(virDomainDefPtr def,
  virDomainDeviceDefPtr dev,
- virDomainDeviceDefPtr oldDev ATTRIBUTE_UNUSED)
+ virDomainDeviceDefPtr oldDev)
 {
-virDomainDeviceInfoPtr info = virDomainDeviceGetInfo(dev);
+virDomainCompatibleDeviceData data = {
+.newInfo = virDomainDeviceGetInfo(dev),
+.oldInfo = virDomainDeviceGetInfo(oldDev),
+};
 
 if (!virDomainDefHasUSB(def) &&
 def->os.type != VIR_DOMAIN_OSTYPE_EXE &&
@@ -27414,7 +27429,7 @@ virDomainDefCompatibleDevice(virDomainDefPtr def,
 return -1;
 }
 
-if (info && info->bootIndex > 0) {
+if (data.newInfo && data.newInfo->bootIndex > 0) {
 if (def->os.nBootDevs > 0) {
 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("per-device boot elements cannot be used"
@@ -27423,7 +27438,7 @@ virDomainDefCompatibleDevice(virDomainDefPtr def,
 }
 if (virDomainDeviceInfoIterate(def,
virDomainDeviceInfoCheckBootIndex,
-   info) < 0)
+   ) < 0)
 return -1;
 }
 
-- 
2.16.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 2/3] Pass oldDev to virDomainDefCompatibleDevice on device update

2018-02-22 Thread Jiri Denemark

When calling virDomainDefCompatibleDevice to check a new device during
device update, we need to pass the original device which is going to be
updated in addition to the new device. Otherwise, the function can
report false conflicts.

The new argument is currently ignored by virDomainDefCompatibleDevice,
but this will change in the following patch.

https://bugzilla.redhat.com/show_bug.cgi?id=1546971

Signed-off-by: Jiri Denemark 
---
 src/conf/domain_conf.c |  3 ++-
 src/conf/domain_conf.h |  3 ++-
 src/lxc/lxc_driver.c   | 15 +--
 src/qemu/qemu_driver.c | 51 --
 4 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f2ddde7a36..c71c28e8d2 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -27400,7 +27400,8 @@ virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def 
ATTRIBUTE_UNUSED,
 
 int
 virDomainDefCompatibleDevice(virDomainDefPtr def,
- virDomainDeviceDefPtr dev)
+ virDomainDeviceDefPtr dev,
+ virDomainDeviceDefPtr oldDev ATTRIBUTE_UNUSED)
 {
 virDomainDeviceInfoPtr info = virDomainDeviceGetInfo(dev);
 
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 2350926e5b..368f16f3fb 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3014,7 +3014,8 @@ typedef enum {
 } virDomainDeviceAction;
 
 int virDomainDefCompatibleDevice(virDomainDefPtr def,
- virDomainDeviceDefPtr dev);
+ virDomainDeviceDefPtr dev,
+ virDomainDeviceDefPtr oldDev);
 
 void virDomainRNGDefFree(virDomainRNGDefPtr def);
 
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 4c6f09a435..fa6fc4643e 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -3578,6 +3578,7 @@ lxcDomainUpdateDeviceConfig(virDomainDefPtr vmdef,
 {
 int ret = -1;
 virDomainNetDefPtr net;
+virDomainDeviceDef oldDev = { .type = dev->type };
 int idx;
 
 switch (dev->type) {
@@ -3586,8 +3587,11 @@ lxcDomainUpdateDeviceConfig(virDomainDefPtr vmdef,
 if ((idx = virDomainNetFindIdx(vmdef, net)) < 0)
 goto cleanup;
 
-virDomainNetDefFree(vmdef->nets[idx]);
+oldDev.data.net = vmdef->nets[idx];
+if (virDomainDefCompatibleDevice(vmdef, dev, ) < 0)
+return -1;
 
+virDomainNetDefFree(vmdef->nets[idx]);
 vmdef->nets[idx] = net;
 dev->data.net = NULL;
 ret = 0;
@@ -4820,7 +4824,7 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr dom,
 if (!vmdef)
 goto endjob;
 
-if (virDomainDefCompatibleDevice(vmdef, dev) < 0)
+if (virDomainDefCompatibleDevice(vmdef, dev, NULL) < 0)
 goto endjob;
 
 if ((ret = lxcDomainAttachDeviceConfig(vmdef, dev)) < 0)
@@ -4828,7 +4832,7 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr dom,
 }
 
 if (flags & VIR_DOMAIN_AFFECT_LIVE) {
-if (virDomainDefCompatibleDevice(vm->def, dev_copy) < 0)
+if (virDomainDefCompatibleDevice(vm->def, dev_copy, NULL) < 0)
 goto endjob;
 
 if ((ret = lxcDomainAttachDeviceLive(dom->conn, driver, vm, dev_copy)) 
< 0)
@@ -4931,9 +4935,8 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr dom,
 if (!vmdef)
 goto endjob;
 
-if (virDomainDefCompatibleDevice(vmdef, dev) < 0)
-goto endjob;
-
+/* virDomainDefCompatibleDevice call is delayed until we know the
+ * device we're going to update. */
 if ((ret = lxcDomainUpdateDeviceConfig(vmdef, dev)) < 0)
 goto endjob;
 }
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 14c39b2610..313d730c79 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7844,6 +7844,7 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm,
 {
 virDomainDiskDefPtr disk = dev->data.disk;
 virDomainDiskDefPtr orig_disk = NULL;
+virDomainDeviceDef oldDev = { .type = dev->type };
 int ret = -1;
 
 if (virDomainDiskTranslateSourcePool(disk) < 0)
@@ -7861,6 +7862,10 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm,
 goto cleanup;
 }
 
+oldDev.data.disk = orig_disk;
+if (virDomainDefCompatibleDevice(vm->def, dev, ) < 0)
+goto cleanup;
+
 if (!qemuDomainDiskChangeSupported(disk, orig_disk))
 goto cleanup;
 
@@ -7903,19 +7908,36 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm,
bool force)
 {
 virQEMUDriverPtr driver = dom->conn->privateData;
+virDomainDeviceDef oldDev = { .type = dev->type };
 int ret = -1;
+int idx;
 
 switch ((virDomainDeviceType) dev->type) {
 case VIR_DOMAIN_DEVICE_DISK:
 qemuDomainObjCheckDiskTaint(driver, vm, dev->data.disk, NULL);
 ret = qemuDomainChangeDiskLive(vm,

Re: [libvirt] RFC: should we mandate use of VPATH builds ?

2018-02-22 Thread Viktor Mihajlovski

On 22.02.2018 14:29, Daniel P. Berrangé wrote:
> One of the things we (well I) constantly screw up is VPATH builds. I've
> always tended to just build in the source tree, and as a result I'll
> often miss changes which break VPATH builds.
> 
> Now our Jenkins CI catches this because it does VPATH builds only, so we
> don't bit-rot for very long.  Unfortunately Travis CI does source tree
> builds only so I don't notice my mistakes when I test branches on Travis
> before pushing.  I'll fix Travis to do VPATH builds too, but
> 
> I notice that most modern build systems will refuse to ever do in source
> tree builds. eg Ninja/Meson/Perl/Python/Go/etc all put build artifacts in
> a separate directory from source.
> 
> We could if we wanted to simply put a check right at the start of the
> configure.ac script to reject any attempt at doing a source tree build
> to force VPATH builds. This would mean we only ever have to care about
> one execution path instead of two execution paths.
> 
> We could even make it such that autogen.sh will actually create a subdir
> "build" and change into it automatically before running configure, to
> help devs do the "right thing" by default.
> 
> Essentially we're talking the difference between
> 
> Today:
> 
>  - Source tree build
> 
> ./autogen.sh && make
> 
>  - VPATH build
> 
> mkdir build && cd build && ../autogen.sh && make
> 
> Possible future
> 
>  - Source tree build
> 
> No.
> 
>  - VPATH build
> 
> ./autogen.sh && cd build && make
> 
> Any opinions ?
> 
> Do people really like source tree builds, or are they (like me) just doing
> them because its the easy/lazy option ?
> 
> Regards,
> Daniel
> 
This would exactly fit my environment, I wouldn't even have to change
the directory name :).

This is prone to cause some confusion though, as it's changing the
default behavior of bootstrapping. Maybe prompt the user in autogen.sh
whether she/he wants to use a build directory (default=YES)?
On the other hand I'm also used to run make check, which should also
uncover VPATH issues.

-- 
Regards,
 Viktor Mihajlovski

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH] qemu_hotplug: Drop dead code in net update

2018-02-22 Thread Jiri Denemark

vm->def->nets[changeidx] can never be NULL for changeidx returned by
virDomainNetFindIdx.

Signed-off-by: Jiri Denemark 
---
 src/qemu/qemu_hotplug.c | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 87cf578acc..e0a5300f08 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -3061,12 +3061,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
 if ((changeidx = virDomainNetFindIdx(vm->def, newdev)) < 0)
 goto cleanup;
 devslot = >def->nets[changeidx];
-
-if (!(olddev = *devslot)) {
-virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-   _("cannot find existing network device to modify"));
-goto cleanup;
-}
+olddev = *devslot;
 
 oldType = virDomainNetGetActualType(olddev);
 if (oldType == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
-- 
2.16.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] RFC: should we mandate use of VPATH builds ?

2018-02-22 Thread Jaroslav Suchanek

On Thu, Feb 22, 2018 at 01:29:35PM +, Daniel P. Berrangé wrote:
> One of the things we (well I) constantly screw up is VPATH builds. I've
> always tended to just build in the source tree, and as a result I'll
> often miss changes which break VPATH builds.
> 
> Now our Jenkins CI catches this because it does VPATH builds only, so we
> don't bit-rot for very long.  Unfortunately Travis CI does source tree
> builds only so I don't notice my mistakes when I test branches on Travis
> before pushing.  I'll fix Travis to do VPATH builds too, but
> 
> I notice that most modern build systems will refuse to ever do in source
> tree builds. eg Ninja/Meson/Perl/Python/Go/etc all put build artifacts in
> a separate directory from source.
> 
> We could if we wanted to simply put a check right at the start of the
> configure.ac script to reject any attempt at doing a source tree build
> to force VPATH builds. This would mean we only ever have to care about
> one execution path instead of two execution paths.
> 
> We could even make it such that autogen.sh will actually create a subdir
> "build" and change into it automatically before running configure, to
> help devs do the "right thing" by default.
> 
> Essentially we're talking the difference between
> 
> Today:
> 
>  - Source tree build
> 
> ./autogen.sh && make
> 
>  - VPATH build
> 
> mkdir build && cd build && ../autogen.sh && make
> 
> Possible future
> 
>  - Source tree build
> 
> No.
> 
>  - VPATH build
> 
> ./autogen.sh && cd build && make
> 
> Any opinions ?
> 
> Do people really like source tree builds, or are they (like me) just doing
> them because its the easy/lazy option ?

I like the idea of VPATH builds as usually it should be possible to build
one shared source tree on different OSs. But since some files in libvirt
are still generated into the source tree this is not fully supported.

On the other hand it does not feel right to mandate it.

Thanks,
J.


pgpSmTNM2fhVV.pgp
Description: PGP signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] RFC: should we mandate use of VPATH builds ?

2018-02-22 Thread Jiri Denemark

On Thu, Feb 22, 2018 at 13:29:35 +, Daniel P. Berrangé wrote:
> One of the things we (well I) constantly screw up is VPATH builds. I've
> always tended to just build in the source tree, and as a result I'll
> often miss changes which break VPATH builds.
> 
> Now our Jenkins CI catches this because it does VPATH builds only, so we
> don't bit-rot for very long.  Unfortunately Travis CI does source tree
> builds only so I don't notice my mistakes when I test branches on Travis
> before pushing.  I'll fix Travis to do VPATH builds too, but

I think most Linux distributions build their packages in tree and also
./configure && make && make install is the well known way of building
software. I don't think we should break it.

> We could even make it such that autogen.sh will actually create a subdir
> "build" and change into it automatically before running configure, to
> help devs do the "right thing" by default.

I don't this is a good idea. It would make using other directory than
./build harder and it won't help developers much anyway since they will
need to change all their paths to the built binaries they want to
execute.

Jirka

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] src: Clean *.logrotate, .aug and libvirtd.policy files on 'make clean'

2018-02-22 Thread Daniel P . Berrangé

On Thu, Feb 22, 2018 at 02:44:58PM +0100, Michal Privoznik wrote:
> On 02/22/2018 02:37 PM, Daniel P. Berrangé wrote:
> > On Thu, Feb 22, 2018 at 02:34:56PM +0100, Michal Privoznik wrote:
> >> Before 3f055b5997c we were doing that. However after the commit
> >> we are leaving the files behind.
> >>
> >> Signed-off-by: Michal Privoznik 
> >> ---
> >>
> >> Pushed under build breaker rule.
> > 
> > What are you running that detects this bug during build ?
> 
> make distcheck

Ah yes, of course.  I'll look to get distcheck included in Travis too.

It would be nice to include the Jenkins CI, but I fear it would increase
the job times significantly  and we've already overloaded there

Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] src: Clean *.logrotate, .aug and libvirtd.policy files on 'make clean'

2018-02-22 Thread Michal Privoznik

On 02/22/2018 02:37 PM, Daniel P. Berrangé wrote:
> On Thu, Feb 22, 2018 at 02:34:56PM +0100, Michal Privoznik wrote:
>> Before 3f055b5997c we were doing that. However after the commit
>> we are leaving the files behind.
>>
>> Signed-off-by: Michal Privoznik 
>> ---
>>
>> Pushed under build breaker rule.
> 
> What are you running that detects this bug during build ?

make distcheck

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] make: fix VPATH build for libvirtd augeas check

2018-02-22 Thread Jiri Denemark

On Thu, Feb 22, 2018 at 13:33:49 +, Daniel P. Berrangé wrote:
> Signed-off-by: Daniel P. Berrangé 
> ---
>  src/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index b8e2cbf139..41a3cb2628 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -2297,7 +2297,7 @@ check-augeas-virtlogd: test_virtlogd.aug
>  if WITH_LIBVIRTD
>  test_libvirtd.aug: remote/test_libvirtd.aug.in \
>   remote/libvirtd.conf $(AUG_GENTEST)
> - $(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf $< $@
> + $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/remote/libvirtd.conf $< $@
>  
>  check-augeas-libvirtd: test_libvirtd.aug
>   $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \

ACK

Jirka

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] RFC: should we mandate use of VPATH builds ?

2018-02-22 Thread Peter Krempa

On Thu, Feb 22, 2018 at 13:29:35 +, Daniel Berrange wrote:
> One of the things we (well I) constantly screw up is VPATH builds. I've
> always tended to just build in the source tree, and as a result I'll
> often miss changes which break VPATH builds.

I vote for _no_. I mostly use in-tree builds except for when messing
with makefiles.

I think the situation is similar to making contributors running
syntax-check. We document it in multiple places that patches should pass
it yet we get patches that fail it all the time.

signature.asc
Description: PGP signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] src: Clean *.logrotate, .aug and libvirtd.policy files on 'make clean'

2018-02-22 Thread Daniel P . Berrangé

On Thu, Feb 22, 2018 at 02:34:56PM +0100, Michal Privoznik wrote:
> Before 3f055b5997c we were doing that. However after the commit
> we are leaving the files behind.
> 
> Signed-off-by: Michal Privoznik 
> ---
> 
> Pushed under build breaker rule.

What are you running that detects this bug during build ?


Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH] src: Clean *.logrotate, .aug and libvirtd.policy files on 'make clean'

2018-02-22 Thread Michal Privoznik

Before 3f055b5997c we were doing that. However after the commit
we are leaving the files behind.

Signed-off-by: Michal Privoznik 
---

Pushed under build breaker rule.

 src/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 41a3cb262..2166e17db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1376,7 +1376,7 @@ augeastest_DATA += test_libvirtd.aug
 
 conf_DATA += remote/libvirtd.conf
 
-CLEANFILES += tets_libvirtd.aug
+CLEANFILES += test_libvirtd.aug
 
 if WITH_POLKIT
 if WITH_POLKIT0
@@ -1389,6 +1389,7 @@ endif ! WITH_POLKIT0
 endif WITH_POLKIT
 
 BUILT_SOURCES += libvirtd.policy
+CLEANFILES += libvirtd.policy
 
 libvirtd.policy: remote/libvirtd.policy.in $(top_builddir)/config.status
$(AM_V_GEN) sed \
@@ -2868,6 +2869,7 @@ if WITH_LIBVIRTD
 LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
 
 BUILT_SOURCES += $(LOGROTATE_FILES)
+CLEANFILES += $(LOGROTATE_FILES)
 
 %.logrotate: remote/%.logrotate.in
$(AM_V_GEN)sed \
-- 
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH] make: fix VPATH build for libvirtd augeas check

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index b8e2cbf139..41a3cb2628 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2297,7 +2297,7 @@ check-augeas-virtlogd: test_virtlogd.aug
 if WITH_LIBVIRTD
 test_libvirtd.aug: remote/test_libvirtd.aug.in \
remote/libvirtd.conf $(AUG_GENTEST)
-   $(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf $< $@
+   $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/remote/libvirtd.conf $< $@
 
 check-augeas-libvirtd: test_libvirtd.aug
$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] RFC: should we mandate use of VPATH builds ?

2018-02-22 Thread Daniel P . Berrangé

One of the things we (well I) constantly screw up is VPATH builds. I've
always tended to just build in the source tree, and as a result I'll
often miss changes which break VPATH builds.

Now our Jenkins CI catches this because it does VPATH builds only, so we
don't bit-rot for very long.  Unfortunately Travis CI does source tree
builds only so I don't notice my mistakes when I test branches on Travis
before pushing.  I'll fix Travis to do VPATH builds too, but

I notice that most modern build systems will refuse to ever do in source
tree builds. eg Ninja/Meson/Perl/Python/Go/etc all put build artifacts in
a separate directory from source.

We could if we wanted to simply put a check right at the start of the
configure.ac script to reject any attempt at doing a source tree build
to force VPATH builds. This would mean we only ever have to care about
one execution path instead of two execution paths.

We could even make it such that autogen.sh will actually create a subdir
"build" and change into it automatically before running configure, to
help devs do the "right thing" by default.

Essentially we're talking the difference between

Today:

 - Source tree build

./autogen.sh && make

 - VPATH build

mkdir build && cd build && ../autogen.sh && make

Possible future

 - Source tree build

No.

 - VPATH build

./autogen.sh && cd build && make

Any opinions ?

Do people really like source tree builds, or are they (like me) just doing
them because its the easy/lazy option ?

Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v1 15/16] make: split vz driver build rules into vz/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am| 31 +--
 src/vz/Makefile.inc.am | 38 ++
 2 files changed, 39 insertions(+), 30 deletions(-)
 create mode 100644 src/vz/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1fcb864c21..7e8be8c05b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,6 +94,7 @@ include xenconfig/Makefile.inc.am
 include libxl/Makefile.inc.am
 include xen/Makefile.inc.am
 include xenapi/Makefile.inc.am
+include vz/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -787,7 +788,6 @@ DRIVER_SOURCE_FILES += \
$(NODE_DEVICE_DRIVER_HAL_SOURCES) \
$(NODE_DEVICE_DRIVER_UDEV_SOURCES) \
$(NWFILTER_DRIVER_SOURCES) \
-   $(VZ_DRIVER_SOURCES) \
$(REMOTE_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
@@ -801,7 +801,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
$(NWFILTER_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
-   $(VZ_DRIVER_SOURCES) \
$(NULL)
 
 
@@ -900,14 +899,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
$(DATATYPES_SOURCES) \
security/virt-aa-helper.c
 
-VZ_DRIVER_SOURCES = \
-   vz/vz_driver.h \
-   vz/vz_driver.c \
-   vz/vz_utils.c \
-   vz/vz_utils.h \
-   vz/vz_sdk.h \
-   vz/vz_sdk.c
-
 NETWORK_DRIVER_SOURCES = \
network/bridge_driver.h network/bridge_driver.c \
network/bridge_driver_platform.h \
@@ -1303,25 +1294,6 @@ EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug 
lxc/test_libvirtd_lxc.aug.in
 
 
 
-
-
-if WITH_VZ
-noinst_LTLIBRARIES += libvirt_driver_vz_impl.la
-libvirt_driver_vz_la_SOURCES =
-libvirt_driver_vz_la_LIBADD = libvirt_driver_vz_impl.la
-mod_LTLIBRARIES += libvirt_driver_vz.la
-libvirt_driver_vz_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_vz_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-libvirt_driver_vz_impl_la_CFLAGS = \
-   -I$(srcdir)/conf \
-   -I$(srcdir)/access \
-   $(AM_CFLAGS) \
-   $(PARALLELS_SDK_CFLAGS) $(LIBNL_CFLAGS)
-libvirt_driver_vz_impl_la_SOURCES = $(VZ_DRIVER_SOURCES)
-libvirt_driver_vz_impl_la_LIBADD =  $(PARALLELS_SDK_LIBS) $(LIBNL_LIBS)
-endif WITH_VZ
-
-
 if WITH_NETWORK
 noinst_LTLIBRARIES += libvirt_driver_network_impl.la
 libvirt_driver_network_la_SOURCES =
@@ -1707,7 +1679,6 @@ access/viraccessapichecklxc.c: 
$(srcdir)/rpc/gendispatch.pl \
 EXTRA_DIST += \
$(REMOTE_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
-   $(VZ_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am
new file mode 100644
index 00..cacdb38795
--- /dev/null
+++ b/src/vz/Makefile.inc.am
@@ -0,0 +1,38 @@
+VZ_DRIVER_SOURCES = \
+   vz/vz_driver.h \
+   vz/vz_driver.c \
+   vz/vz_utils.c \
+   vz/vz_utils.h \
+   vz/vz_sdk.h \
+   vz/vz_sdk.c \
+   $(NULL)
+
+
+DRIVER_SOURCE_FILES += $(VZ_DRIVER_SOURCES)
+STATEFUL_DRIVER_SOURCE_FILES += $(VZ_DRIVER_SOURCES)
+EXTRA_DIST += $(VZ_DRIVER_SOURCES)
+
+
+if WITH_VZ
+noinst_LTLIBRARIES += libvirt_driver_vz_impl.la
+libvirt_driver_vz_la_SOURCES =
+libvirt_driver_vz_la_LIBADD = \
+   libvirt_driver_vz_impl.la \
+   libvirt.la \
+   ../gnulib/lib/libgnu.la \
+   $(NULL)
+mod_LTLIBRARIES += libvirt_driver_vz.la
+libvirt_driver_vz_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
+libvirt_driver_vz_impl_la_CFLAGS = \
+   -I$(srcdir)/conf \
+   -I$(srcdir)/access \
+   $(AM_CFLAGS) \
+   $(PARALLELS_SDK_CFLAGS) \
+   $(LIBNL_CFLAGS) \
+   $(NULL)
+libvirt_driver_vz_impl_la_SOURCES = $(VZ_DRIVER_SOURCES)
+libvirt_driver_vz_impl_la_LIBADD = \
+   $(PARALLELS_SDK_LIBS) \
+   $(LIBNL_LIBS) \
+   $(NULL)
+endif WITH_VZ
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v1 16/16] make: split lxc driver build rules into lxc/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am | 184 ++
 src/lxc/Makefile.inc.am | 207 
 2 files changed, 212 insertions(+), 179 deletions(-)
 create mode 100644 src/lxc/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7e8be8c05b..6406b01cfd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,6 +79,8 @@ AUGEAS_DIRS =
 if WITH_DTRACE_PROBES
 tapset_DATA =
 endif WITH_DTRACE_PROBES
+libexec_PROGRAMS =
+RPC_PROBE_FILES =
 
 include uml/Makefile.inc.am
 include phyp/Makefile.inc.am
@@ -95,6 +97,7 @@ include libxl/Makefile.inc.am
 include xen/Makefile.inc.am
 include xenapi/Makefile.inc.am
 include vz/Makefile.inc.am
+include lxc/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -782,7 +785,6 @@ EXTRA_DIST += check-drivername.pl
 
 DRIVER_SOURCE_FILES += \
$(INTERFACE_DRIVER_SOURCES) \
-   $(LXC_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(NODE_DEVICE_DRIVER_SOURCES) \
$(NODE_DEVICE_DRIVER_HAL_SOURCES) \
@@ -795,7 +797,6 @@ DRIVER_SOURCE_FILES += \
 
 STATEFUL_DRIVER_SOURCE_FILES += \
$(INTERFACE_DRIVER_SOURCES) \
-   $(LXC_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(NODE_DEVICE_DRIVER_SOURCES) \
$(NWFILTER_DRIVER_SOURCES) \
@@ -829,72 +830,6 @@ check-local: check-protocol check-symfile check-symsorting 
\
 .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)
 
 
-LXC_MONITOR_PROTOCOL_GENERATED = \
-   lxc/lxc_monitor_protocol.h \
-   lxc/lxc_monitor_protocol.c \
-   $(NULL)
-
-LXC_MONITOR_GENERATED = \
-   lxc/lxc_monitor_dispatch.h \
-   $(NULL)
-
-LXC_CONTROLLER_GENERATED = \
-   lxc/lxc_controller_dispatch.h \
-   $(NULL)
-
-LXC_GENERATED = \
-   $(LXC_MONITOR_PROTOCOL_GENERATED) \
-   $(LXC_MONITOR_GENERATED) \
-   $(LXC_CONTROLLER_GENERATED) \
-   $(NULL)
-
-LXC_MONITOR_PROTOCOL = $(srcdir)/lxc/lxc_monitor_protocol.x
-
-lxc/lxc_monitor_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
-   $(LXC_MONITOR_PROTOCOL) Makefile.am
-   $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \
- virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \
- $(srcdir)/lxc/lxc_monitor_dispatch.h
-
-lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
-   $(REMOTE_PROTOCOL) Makefile.am
-   $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=server \
- virLXCMonitor VIR_LXC_MONITOR $(LXC_MONITOR_PROTOCOL) > \
- $(srcdir)/lxc/lxc_controller_dispatch.h
-
-EXTRA_DIST += \
-   $(LXC_MONITOR_PROTOCOL) \
-   $(LXC_GENERATED) \
-   $(NULL)
-
-BUILT_SOURCES += $(LXC_GENERATED)
-
-CLEANFILES += $(LXC_GENERATED)
-
-LXC_DRIVER_SOURCES = \
-   $(LXC_MONITOR_PROTOCOL_GENERATED) \
-   $(LXC_MONITOR_GENERATED) \
-   lxc/lxc_conf.c lxc/lxc_conf.h \
-   lxc/lxc_container.c lxc/lxc_container.h \
-   lxc/lxc_cgroup.c lxc/lxc_cgroup.h \
-   lxc/lxc_domain.c lxc/lxc_domain.h \
-   lxc/lxc_hostdev.c lxc/lxc_hostdev.h \
-   lxc/lxc_monitor.c lxc/lxc_monitor.h \
-   lxc/lxc_process.c lxc/lxc_process.h \
-   lxc/lxc_fuse.c lxc/lxc_fuse.h \
-   lxc/lxc_native.c lxc/lxc_native.h \
-   lxc/lxc_driver.c lxc/lxc_driver.h
-
-LXC_CONTROLLER_SOURCES = \
-   $(LXC_MONITOR_PROTOCOL_GENERATED) \
-   $(LXC_CONTROLLER_GENERATED) \
-   lxc/lxc_conf.c lxc/lxc_conf.h \
-   lxc/lxc_container.c lxc/lxc_container.h \
-   lxc/lxc_cgroup.c lxc/lxc_cgroup.h \
-   lxc/lxc_domain.c lxc/lxc_domain.h \
-   lxc/lxc_fuse.c lxc/lxc_fuse.h \
-   lxc/lxc_controller.c
-
 SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
$(DATATYPES_SOURCES) \
security/virt-aa-helper.c
@@ -1252,48 +1187,6 @@ EXTRA_DIST += \
   $< $(srcdir)/$(subst $(srcdir)/,,$@)
 
 
-
-
-
-if WITH_LXC
-noinst_LTLIBRARIES += libvirt_driver_lxc_impl.la
-libvirt_driver_lxc_la_SOURCES =
-libvirt_driver_lxc_la_LIBADD = libvirt_driver_lxc_impl.la
-mod_LTLIBRARIES += libvirt_driver_lxc.la
-libvirt_driver_lxc_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_lxc_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-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] [PATCH v1 01/16] make: split UML driver build rules into uml/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am | 57 +++--
 src/uml/Makefile.inc.am | 46 +++
 2 files changed, 63 insertions(+), 40 deletions(-)
 create mode 100644 src/uml/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b8e2cbf139..3c346b37aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-## Copyright (C) 2005-2016 Red Hat, Inc.
+## Copyright (C) 2005-2018 Red Hat, Inc.
 ##
 ## This library is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU Lesser General Public
@@ -63,6 +63,17 @@ CLEANFILES =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
 nodist_conf_DATA =
+DRIVER_SOURCE_FILES =
+STATEFUL_DRIVER_SOURCE_FILES =
+noinst_LTLIBRARIES =
+mod_LTLIBRARIES =
+INSTALL_DATA_DIRS =
+
+include uml/Makefile.inc.am
+
+install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
+uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
+
 
 THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
 
@@ -84,7 +95,6 @@ endif WITH_NETWORK
 lib_LTLIBRARIES = libvirt.la libvirt-qemu.la libvirt-lxc.la
 
 moddir = $(libdir)/libvirt/connection-driver
-mod_LTLIBRARIES =
 sbin_PROGRAMS =
 
 confdir = $(sysconfdir)/libvirt
@@ -747,7 +757,7 @@ check-drivername:
 
 EXTRA_DIST += check-drivername.pl
 
-DRIVER_SOURCE_FILES = \
+DRIVER_SOURCE_FILES += \
$(ESX_DRIVER_SOURCES) \
$(HYPERV_DRIVER_SORUCES) \
$(INTERFACE_DRIVER_SOURCES) \
@@ -766,7 +776,6 @@ DRIVER_SOURCE_FILES = \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
$(TEST_DRIVER_SOURCES) \
-   $(UML_DRIVER_SOURCES) \
$(VBOX_DRIVER_SOURCES) \
vbox/vbox_tmpl.c \
$(VMWARE_DRIVER_SOURCES) \
@@ -774,7 +783,7 @@ DRIVER_SOURCE_FILES = \
$(XENAPI_DRIVER_SOURCES) \
$(NULL)
 
-STATEFUL_DRIVER_SOURCE_FILES = \
+STATEFUL_DRIVER_SOURCE_FILES += \
$(BHYVE_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
@@ -785,7 +794,6 @@ STATEFUL_DRIVER_SOURCE_FILES = \
$(QEMU_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
-   $(UML_DRIVER_SOURCES) \
$(XEN_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
$(NULL)
@@ -980,10 +988,6 @@ LIBXL_DRIVER_SOURCES = \
libxl/libxl_logger.c libxl/libxl_logger.h \
libxl/libxl_migration.c libxl/libxl_migration.h
 
-UML_DRIVER_SOURCES = \
-   uml/uml_conf.c uml/uml_conf.h \
-   uml/uml_driver.c uml/uml_driver.h
-
 ESX_DRIVER_SOURCES = \
esx/esx_private.h \
esx/esx_driver.c esx/esx_driver.h \
@@ -1255,7 +1259,7 @@ EXTRA_DIST += $(pkgdata_DATA)
 #
 # First deal with sources usable in non-daemon context
 
-noinst_LTLIBRARIES = libvirt_util.la
+noinst_LTLIBRARIES += libvirt_util.la
 libvirt_la_LIBADD = $(libvirt_la_BUILT_LIBADD)
 libvirt_la_BUILT_LIBADD = libvirt_util.la
 libvirt_util_la_SOURCES = \
@@ -1635,22 +1639,6 @@ CLEANFILES += test_libvirtd_lxc.aug
 endif WITH_LXC
 EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug lxc/test_libvirtd_lxc.aug.in
 
-if WITH_UML
-noinst_LTLIBRARIES += libvirt_driver_uml_impl.la
-libvirt_driver_uml_la_SOURCES =
-libvirt_driver_uml_la_LIBADD = libvirt_driver_uml_impl.la
-mod_LTLIBRARIES += libvirt_driver_uml.la
-libvirt_driver_uml_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_uml_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-libvirt_driver_uml_impl_la_CFLAGS = \
-   -I$(srcdir)/access \
-   -I$(srcdir)/conf \
-   $(AM_CFLAGS)
-libvirt_driver_uml_impl_la_LDFLAGS = $(AM_LDFLAGS)
-# libvirt_driver_uml_impl_la_LIBADD =
-libvirt_driver_uml_impl_la_SOURCES = $(UML_DRIVER_SOURCES)
-endif WITH_UML
 
 
 BUILT_SOURCES += $(ESX_DRIVER_GENERATED)
@@ -2135,7 +2123,6 @@ EXTRA_DIST += \
$(XEN_DRIVER_SOURCES) \
$(QEMU_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
-   $(UML_DRIVER_SOURCES) \
$(OPENVZ_DRIVER_SOURCES) \
$(PHYP_DRIVER_SOURCES) \
$(VBOX_DRIVER_SOURCES) \
@@ -3567,7 +3554,7 @@ endif WITH_NSS
 
 install-data-local: install-init install-systemd install-upstart \
install-sysctl install-polkit install-sasl \
-   install-logrotate
+   install-logrotate install-data-extra
 if WITH_LIBVIRTD
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd"
@@ -3597,11 +3584,6 @@ if WITH_LIBXL
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl"
 endif WITH_LIBXL
-if WITH_UML
-   $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml"
-   $(MKDIR_P)

[libvirt] [PATCH v1 09/16] make: split qemu driver build rules into qemu/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am  | 122 +-
 src/qemu/Makefile.inc.am | 148 +++
 2 files changed, 162 insertions(+), 108 deletions(-)
 create mode 100644 src/qemu/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7927bcbb04..18566ca920 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,6 +72,13 @@ libvirt_la_BUILT_LIBADD =
 SYM_FILES =
 USED_SYM_FILES =
 GENERATED_SYM_FILES =
+augeas_DATA =
+augeastest_DATA =
+conf_DATA =
+AUGEAS_DIRS =
+if WITH_DTRACE_PROBES
+tapset_DATA =
+endif WITH_DTRACE_PROBES
 
 include uml/Makefile.inc.am
 include phyp/Makefile.inc.am
@@ -81,6 +88,7 @@ include hyperv/Makefile.inc.am
 include vmware/Makefile.inc.am
 include vbox/Makefile.inc.am
 include openvz/Makefile.inc.am
+include qemu/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -109,13 +117,11 @@ moddir = $(libdir)/libvirt/connection-driver
 sbin_PROGRAMS =
 
 confdir = $(sysconfdir)/libvirt
-conf_DATA = libvirt.conf libvirt-admin.conf
+conf_DATA += libvirt.conf libvirt-admin.conf
 
 augeasdir = $(datadir)/augeas/lenses
-augeas_DATA =
 
 augeastestdir = $(datadir)/augeas/lenses/tests
-augeastest_DATA =
 
 # These files are not related to driver APIs. Simply generic
 # helper APIs for various purposes
@@ -778,7 +784,6 @@ DRIVER_SOURCE_FILES += \
$(NODE_DEVICE_DRIVER_UDEV_SOURCES) \
$(NWFILTER_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
-   $(QEMU_DRIVER_SOURCES) \
$(REMOTE_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
@@ -794,7 +799,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
$(NETWORK_DRIVER_SOURCES) \
$(NODE_DEVICE_DRIVER_SOURCES) \
$(NWFILTER_DRIVER_SOURCES) \
-   $(QEMU_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
$(XEN_DRIVER_SOURCES) \
@@ -908,35 +912,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
$(DATATYPES_SOURCES) \
security/virt-aa-helper.c
 
-QEMU_DRIVER_SOURCES = \
-   qemu/qemu_agent.c qemu/qemu_agent.h \
-   qemu/qemu_alias.c qemu/qemu_alias.h \
-   qemu/qemu_block.c qemu/qemu_block.h \
-   qemu/qemu_blockjob.c qemu/qemu_blockjob.h \
-   qemu/qemu_capabilities.c qemu/qemu_capabilities.h \
-   qemu/qemu_command.c qemu/qemu_command.h \
-   qemu/qemu_parse_command.c qemu/qemu_parse_command.h \
-   qemu/qemu_domain.c qemu/qemu_domain.h \
-   qemu/qemu_domain_address.c qemu/qemu_domain_address.h \
-   qemu/qemu_cgroup.c qemu/qemu_cgroup.h \
-   qemu/qemu_hostdev.c qemu/qemu_hostdev.h \
-   qemu/qemu_hotplug.c qemu/qemu_hotplug.h \
-   qemu/qemu_hotplugpriv.h \
-   qemu/qemu_conf.c qemu/qemu_conf.h \
-   qemu/qemu_process.c qemu/qemu_process.h \
-   qemu/qemu_processpriv.h \
-   qemu/qemu_migration.c qemu/qemu_migration.h \
-   qemu/qemu_migration_cookie.c qemu/qemu_migration_cookie.h \
-   qemu/qemu_monitor.c qemu/qemu_monitor.h \
-   qemu/qemu_monitor_text.c \
-   qemu/qemu_monitor_text.h \
-   qemu/qemu_monitor_json.c \
-   qemu/qemu_monitor_json.h \
-   qemu/qemu_driver.c qemu/qemu_driver.h \
-   qemu/qemu_interface.c qemu/qemu_interface.h \
-   qemu/qemu_capspriv.h \
-   qemu/qemu_security.c qemu/qemu_security.h
-
 XENAPI_DRIVER_SOURCES = \
xenapi/xenapi_driver.c xenapi/xenapi_driver.h \
xenapi/xenapi_driver_private.h \
@@ -1418,41 +1393,6 @@ endif WITH_LIBXL
 EXTRA_DIST += libxl/libxl.conf libxl/libvirtd_libxl.aug \
libxl/test_libvirtd_libxl.aug.in
 
-if WITH_QEMU
-noinst_LTLIBRARIES += libvirt_driver_qemu_impl.la
-libvirt_driver_qemu_la_SOURCES =
-libvirt_driver_qemu_la_LIBADD = libvirt_driver_qemu_impl.la
-mod_LTLIBRARIES += libvirt_driver_qemu.la
-libvirt_driver_qemu_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_qemu_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-libvirt_driver_qemu_impl_la_CFLAGS = \
-   $(GNUTLS_CFLAGS) \
-   $(LIBNL_CFLAGS) \
-   $(SELINUX_CFLAGS) \
-   $(XDR_CFLAGS) \
-   -I$(srcdir)/access \
-   -I$(srcdir)/conf \
-   -I$(srcdir)/secret \
-   $(AM_CFLAGS)
-libvirt_driver_qemu_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_qemu_impl_la_LIBADD = $(CAPNG_LIBS) \
-$(GNUTLS_LIBS) \
-   $(LIBNL_LIBS) \
-   $(SELINUX_LIBS) \
-   $(LIBXML_LIBS) \
-

[libvirt] [PATCH v1 10/16] make: split bhyve driver build rules into bhyve/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am   | 62 ++--
 src/bhyve/Makefile.inc.am | 73 +++
 2 files changed, 75 insertions(+), 60 deletions(-)
 create mode 100644 src/bhyve/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 18566ca920..5968f4c5ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,6 +89,7 @@ include vmware/Makefile.inc.am
 include vbox/Makefile.inc.am
 include openvz/Makefile.inc.am
 include qemu/Makefile.inc.am
+include bhyve/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -792,7 +793,6 @@ DRIVER_SOURCE_FILES += \
$(NULL)
 
 STATEFUL_DRIVER_SOURCE_FILES += \
-   $(BHYVE_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
@@ -933,28 +933,6 @@ VZ_DRIVER_SOURCES = \
vz/vz_sdk.h \
vz/vz_sdk.c
 
-BHYVE_DRIVER_SOURCES = \
-   bhyve/bhyve_capabilities.c \
-   bhyve/bhyve_capabilities.h \
-   bhyve/bhyve_command.c \
-   bhyve/bhyve_command.h \
-   bhyve/bhyve_conf.c \
-   bhyve/bhyve_conf.h \
-   bhyve/bhyve_parse_command.c \
-   bhyve/bhyve_parse_command.h \
-   bhyve/bhyve_device.c \
-   bhyve/bhyve_device.h \
-   bhyve/bhyve_domain.c \
-   bhyve/bhyve_domain.h \
-   bhyve/bhyve_driver.h \
-   bhyve/bhyve_driver.c \
-   bhyve/bhyve_monitor.c \
-   bhyve/bhyve_monitor.h \
-   bhyve/bhyve_process.c \
-   bhyve/bhyve_process.h \
-   bhyve/bhyve_utils.h \
-   $(NULL)
-
 NETWORK_DRIVER_SOURCES = \
network/bridge_driver.h network/bridge_driver.c \
network/bridge_driver_platform.h \
@@ -1452,28 +1430,6 @@ libvirt_driver_vz_impl_la_SOURCES = $(VZ_DRIVER_SOURCES)
 libvirt_driver_vz_impl_la_LIBADD =  $(PARALLELS_SDK_LIBS) $(LIBNL_LIBS)
 endif WITH_VZ
 
-if WITH_BHYVE
-noinst_LTLIBRARIES += libvirt_driver_bhyve_impl.la
-libvirt_driver_bhyve_la_SOURCES =
-libvirt_driver_bhyve_la_LIBADD = libvirt_driver_bhyve_impl.la
-mod_LTLIBRARIES += libvirt_driver_bhyve.la
-libvirt_driver_bhyve_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_bhyve_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-libvirt_driver_bhyve_impl_la_CFLAGS = \
-   -I$(srcdir)/access \
-   -I$(srcdir)/conf \
-   $(AM_CFLAGS)
-libvirt_driver_bhyve_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_bhyve_impl_la_SOURCES = $(BHYVE_DRIVER_SOURCES)
-
-conf_DATA += bhyve/bhyve.conf
-augeas_DATA += bhyve/libvirtd_bhyve.aug
-augeastest_DATA += test_libvirtd_bhyve.aug
-endif WITH_BHYVE
-EXTRA_DIST += bhyve/bhyve.conf \
-   bhyve/libvirtd_bhyve.aug \
-   bhyve/test_libvirtd_bhyve.aug.in
 
 if WITH_NETWORK
 noinst_LTLIBRARIES += libvirt_driver_network_impl.la
@@ -1864,7 +1820,6 @@ EXTRA_DIST += \
$(XENAPI_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
-   $(BHYVE_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
@@ -1898,14 +1853,13 @@ check-local: check-augeas
check-augeas-sanlock \
check-augeas-lockd \
check-augeas-libxl \
-   check-augeas-bhyve \
check-augeas-libvirtd \
$(NULL)
 
 check-augeas: $(AUGEAS_DIRS:%=check-augeas-%) \
check-augeas-lxc check-augeas-sanlock \
check-augeas-lockd check-augeas-virtlockd check-augeas-libxl \
-   check-augeas-bhyve check-augeas-virtlogd check-augeas-libvirtd
+   check-augeas-virtlogd check-augeas-libvirtd
 
 AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl
 EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl
@@ -1975,18 +1929,6 @@ else ! WITH_LIBXL
 check-augeas-libxl:
 endif ! WITH_LIBXL
 
-if WITH_BHYVE
-test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \
-   $(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST)
-   $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< $@
-
-check-augeas-bhyve: test_libvirtd_bhyve.aug
-   $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-   '$(AUGPARSE)' -I $(srcdir)/bhyve test_libvirtd_bhyve.aug; \
-   fi
-else ! WITH_BHYVE
-check-augeas-bhyve:
-endif ! WITH_BHYVE
 
 test_virtlogd.aug: logging/test_virtlogd.aug.in \
logging/virtlogd.conf $(AUG_GENTEST)
diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
new file mode 100644
index 00..fba1b9ef30
--- /dev/null
+++ b/src/bhyve/Makefile.inc.am
@@ -0,0 +1,73 @@
+BHYVE_DRIVER_SOURCES = \
+   bhyve/bhyve_capabilities.c \
+   bhyve/bhyve_capabilities.h \
+

[libvirt] [PATCH v1 11/16] make: split xenconfig driver build rules into xenconfig/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am   | 21 +
 src/xenconfig/Makefile.inc.am | 28 
 2 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 src/xenconfig/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5968f4c5ba..2c04d3cc95 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -90,6 +90,7 @@ include vbox/Makefile.inc.am
 include openvz/Makefile.inc.am
 include qemu/Makefile.inc.am
 include bhyve/Makefile.inc.am
+include xenconfig/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -1102,11 +1103,6 @@ CPU_SOURCES = \
 VMX_SOURCES = \
vmx/vmx.c vmx/vmx.h
 
-XENCONFIG_SOURCES = \
-   xenconfig/xenxs_private.h \
-   xenconfig/xen_common.c xenconfig/xen_common.h \
-   xenconfig/xen_sxpr.c xenconfig/xen_sxpr.h \
-   xenconfig/xen_xm.c xenconfig/xen_xm.h
 if WITH_LIBXL
 XENCONFIG_LIBXL_SOURCES = \
$(XENCONFIG_SOURCES) \
@@ -1167,13 +1163,6 @@ libvirt_vmx_la_CFLAGS = \
 libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
 endif WITH_VMX
 
-if WITH_XENCONFIG
-noinst_LTLIBRARIES += libvirt_xenconfig.la
-libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la
-libvirt_xenconfig_la_CFLAGS = \
-   -I$(srcdir)/conf $(AM_CFLAGS)
-libvirt_xenconfig_la_SOURCES = $(XENCONFIG_SOURCES)
-
 if WITH_LIBXL
 noinst_LTLIBRARIES += libvirt_xenconfig_libxl.la
 libvirt_xenconfig_libxl_la_LIBADD = $(LIBXL_LIBS)
@@ -1181,7 +1170,6 @@ libvirt_xenconfig_libxl_la_CFLAGS = \
-I$(srcdir)/conf -I$(srcdir)/libxl $(AM_CFLAGS)
 libvirt_xenconfig_libxl_la_SOURCES = $(XENCONFIG_LIBXL_SOURCES)
 endif WITH_LIBXL
-endif WITH_XENCONFIG
 
 
 noinst_LTLIBRARIES += libvirt_driver.la
@@ -1842,7 +1830,6 @@ EXTRA_DIST += \
$(SECURITY_DRIVER_APPARMOR_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(SECRET_UTIL_SOURCES) \
-   $(XENCONFIG_SOURCES) \
$(XENCONFIG_LIBXL_SOURCES) \
$(ACCESS_DRIVER_POLKIT_POLICY)
 
@@ -1990,12 +1977,6 @@ else ! WITH_VMX
 SYM_FILES += $(srcdir)/libvirt_vmx.syms
 endif ! WITH_VMX
 
-if WITH_XENCONFIG
-USED_SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
-else ! WITH_XENCONFIG
-SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
-endif ! WITH_XENCONFIG
-
 if WITH_SASL
 USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms
 else ! WITH_SASL
diff --git a/src/xenconfig/Makefile.inc.am b/src/xenconfig/Makefile.inc.am
new file mode 100644
index 00..a87d69990f
--- /dev/null
+++ b/src/xenconfig/Makefile.inc.am
@@ -0,0 +1,28 @@
+XENCONFIG_SOURCES = \
+   xenconfig/xenxs_private.h \
+   xenconfig/xen_common.c \
+   xenconfig/xen_common.h \
+   xenconfig/xen_sxpr.c \
+   xenconfig/xen_sxpr.h \
+   xenconfig/xen_xm.c \
+   xenconfig/xen_xm.h \
+   $(NULL)
+
+EXTRA_DIST += $(XENCONFIG_SOURCES)
+
+if WITH_XENCONFIG
+noinst_LTLIBRARIES += libvirt_xenconfig.la
+libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la
+libvirt_xenconfig_la_CFLAGS = \
+   -I$(srcdir)/conf \
+   $(AM_CFLAGS) \
+   $(NULL)
+libvirt_xenconfig_la_SOURCES = $(XENCONFIG_SOURCES)
+
+endif WITH_XENCONFIG
+
+if WITH_XENCONFIG
+USED_SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
+else ! WITH_XENCONFIG
+SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
+endif ! WITH_XENCONFIG
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v1 12/16] make: split libxl driver build rules into libxl/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am   |  82 +---
 src/libxl/Makefile.inc.am | 104 ++
 2 files changed, 106 insertions(+), 80 deletions(-)
 create mode 100644 src/libxl/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 2c04d3cc95..46a5210f8a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -91,6 +91,7 @@ include openvz/Makefile.inc.am
 include qemu/Makefile.inc.am
 include bhyve/Makefile.inc.am
 include xenconfig/Makefile.inc.am
+include libxl/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -778,7 +779,6 @@ EXTRA_DIST += check-drivername.pl
 
 DRIVER_SOURCE_FILES += \
$(INTERFACE_DRIVER_SOURCES) \
-   $(LIBXL_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(NODE_DEVICE_DRIVER_SOURCES) \
@@ -795,7 +795,6 @@ DRIVER_SOURCE_FILES += \
 
 STATEFUL_DRIVER_SOURCE_FILES += \
$(INTERFACE_DRIVER_SOURCES) \
-   $(LIBXL_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(NODE_DEVICE_DRIVER_SOURCES) \
@@ -918,14 +917,6 @@ XENAPI_DRIVER_SOURCES = \
xenapi/xenapi_driver_private.h \
xenapi/xenapi_utils.c xenapi/xenapi_utils.h
 
-LIBXL_DRIVER_SOURCES = \
-   libxl/libxl_conf.c libxl/libxl_conf.h \
-   libxl/libxl_capabilities.c libxl/libxl_capabilities.h \
-   libxl/libxl_domain.c libxl/libxl_domain.h \
-   libxl/libxl_driver.c libxl/libxl_driver.h \
-   libxl/libxl_logger.c libxl/libxl_logger.h \
-   libxl/libxl_migration.c libxl/libxl_migration.h
-
 VZ_DRIVER_SOURCES = \
vz/vz_driver.h \
vz/vz_driver.c \
@@ -1103,11 +1094,6 @@ CPU_SOURCES = \
 VMX_SOURCES = \
vmx/vmx.c vmx/vmx.h
 
-if WITH_LIBXL
-XENCONFIG_LIBXL_SOURCES = \
-   $(XENCONFIG_SOURCES) \
-   xenconfig/xen_xl.c xenconfig/xen_xl.h
-endif WITH_LIBXL
 
 pkgdata_DATA = cpu/cpu_map.xml
 
@@ -1163,14 +1149,6 @@ libvirt_vmx_la_CFLAGS = \
 libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
 endif WITH_VMX
 
-if WITH_LIBXL
-noinst_LTLIBRARIES += libvirt_xenconfig_libxl.la
-libvirt_xenconfig_libxl_la_LIBADD = $(LIBXL_LIBS)
-libvirt_xenconfig_libxl_la_CFLAGS = \
-   -I$(srcdir)/conf -I$(srcdir)/libxl $(AM_CFLAGS)
-libvirt_xenconfig_libxl_la_SOURCES = $(XENCONFIG_LIBXL_SOURCES)
-endif WITH_LIBXL
-
 
 noinst_LTLIBRARIES += libvirt_driver.la
 libvirt_la_BUILT_LIBADD += libvirt_driver.la
@@ -1328,36 +1306,6 @@ libvirt_driver_xenapi_la_LIBADD = $(XENAPI_LIBS) 
$(CURL_LIBS)
 libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES)
 endif WITH_XENAPI
 
-if WITH_LIBXL
-noinst_LTLIBRARIES += libvirt_driver_libxl_impl.la
-libvirt_driver_libxl_la_SOURCES =
-libvirt_driver_libxl_la_LIBADD = libvirt_driver_libxl_impl.la
-mod_LTLIBRARIES += libvirt_driver_libxl.la
-libvirt_driver_libxl_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_libxl_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-libvirt_driver_libxl_impl_la_CFLAGS = \
-   $(LIBXL_CFLAGS) \
-   $(LIBXML_CFLAGS) \
-   -I$(srcdir)/access \
-   -I$(srcdir)/conf \
-   -I$(srcdir)/secret \
-   -I$(srcdir)/xenconfig \
-   $(AM_CFLAGS)
-libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_libxl_impl_la_LIBADD = $(LIBXL_LIBS) \
- $(LIBXML_LIBS) \
- libvirt_xenconfig_libxl.la
-libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES)
-
-conf_DATA += libxl/libxl.conf
-augeas_DATA += libxl/libvirtd_libxl.aug
-augeastest_DATA += test_libvirtd_libxl.aug
-CLEANFILES += test_libvirtd_libxl.aug
-
-endif WITH_LIBXL
-EXTRA_DIST += libxl/libxl.conf libxl/libvirtd_libxl.aug \
-   libxl/test_libvirtd_libxl.aug.in
 
 
 
@@ -1806,7 +1754,6 @@ EXTRA_DIST += \
$(XEN_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
-   $(LIBXL_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
@@ -1830,7 +1777,6 @@ EXTRA_DIST += \
$(SECURITY_DRIVER_APPARMOR_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(SECRET_UTIL_SOURCES) \
-   $(XENCONFIG_LIBXL_SOURCES) \
$(ACCESS_DRIVER_POLKIT_POLICY)
 
 check-local: check-augeas
@@ -1839,13 +1785,12 @@ check-local: check-augeas
check-augeas-lxc \
check-augeas-sanlock \
check-augeas-lockd \
-   check-augeas-libxl \
check-augeas-libvirtd \
$(NULL)
 
 check-augeas: $(AUGEAS_DIRS:%=check-augeas-%) \
check-augeas-lxc

[libvirt] [PATCH v1 04/16] make: split ESX driver build rules into esx/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am | 79 ---
 src/esx/Makefile.inc.am | 90 +
 2 files changed, 97 insertions(+), 72 deletions(-)
 create mode 100644 src/esx/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index bec7930c2b..b952bb00e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,10 +69,14 @@ noinst_LTLIBRARIES =
 mod_LTLIBRARIES =
 INSTALL_DATA_DIRS =
 libvirt_la_BUILT_LIBADD =
+SYM_FILES =
+USED_SYM_FILES =
+GENERATED_SYM_FILES =
 
 include uml/Makefile.inc.am
 include phyp/Makefile.inc.am
 include test/Makefile.inc.am
+include esx/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -761,7 +765,6 @@ check-drivername:
 EXTRA_DIST += check-drivername.pl
 
 DRIVER_SOURCE_FILES += \
-   $(ESX_DRIVER_SOURCES) \
$(HYPERV_DRIVER_SORUCES) \
$(INTERFACE_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
@@ -981,39 +984,6 @@ LIBXL_DRIVER_SOURCES = \
libxl/libxl_logger.c libxl/libxl_logger.h \
libxl/libxl_migration.c libxl/libxl_migration.h
 
-ESX_DRIVER_SOURCES = \
-   esx/esx_private.h \
-   esx/esx_driver.c esx/esx_driver.h \
-   esx/esx_interface_driver.c esx/esx_interface_driver.h \
-   esx/esx_network_driver.c esx/esx_network_driver.h \
-   esx/esx_storage_driver.c esx/esx_storage_driver.h \
-   esx/esx_storage_backend_vmfs.c esx/esx_storage_backend_vmfs.h \
-   esx/esx_storage_backend_iscsi.c esx/esx_storage_backend_iscsi.h 
\
-   esx/esx_stream.c esx/esx_stream.h \
-   esx/esx_util.c esx/esx_util.h \
-   esx/esx_vi.c esx/esx_vi.h \
-   esx/esx_vi_methods.c esx/esx_vi_methods.h \
-   esx/esx_vi_types.c esx/esx_vi_types.h
-
-ESX_DRIVER_GENERATED = \
-   esx/esx_vi_methods.generated.c \
-   esx/esx_vi_methods.generated.h \
-   esx/esx_vi_methods.generated.macro \
-   esx/esx_vi_types.generated.c \
-   esx/esx_vi_types.generated.h \
-   esx/esx_vi_types.generated.typedef \
-   esx/esx_vi_types.generated.typeenum \
-   esx/esx_vi_types.generated.typetostring \
-   esx/esx_vi_types.generated.typefromstring \
-   esx/esx_vi.generated.c \
-   esx/esx_vi.generated.h
-
-ESX_DRIVER_EXTRA_DIST = \
-   esx/README \
-   esx/esx_vi_generator.input \
-   esx/esx_vi_generator.py \
-   $(ESX_DRIVER_GENERATED)
-
 HYPERV_DRIVER_SOURCES = \
hyperv/hyperv_private.h \
hyperv/hyperv_driver.c hyperv/hyperv_driver.h \
@@ -1325,9 +1295,9 @@ libvirt_driver_la_LIBADD = \
 
 # All .syms files should be placed in exactly one of these three lists,
 # depending on whether they are stored in git and/or used in the build.
-SYM_FILES = $(USED_SYM_FILES)
-USED_SYM_FILES = $(srcdir)/libvirt_private.syms
-GENERATED_SYM_FILES = \
+SYM_FILES += $(USED_SYM_FILES)
+USED_SYM_FILES += $(srcdir)/libvirt_private.syms
+GENERATED_SYM_FILES += \
$(ACCESS_DRIVER_SYM_FILES) \
libvirt.syms libvirt.def libvirt_qemu.def libvirt_lxc.def \
libvirt_admin.syms libvirt_admin.def \
@@ -1613,33 +1583,6 @@ EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug 
lxc/test_libvirtd_lxc.aug.in
 
 
 
-BUILT_SOURCES += $(ESX_DRIVER_GENERATED)
-
-ESX_GENERATED_STAMP = .esx_vi_generator.stamp
-
-EXTRA_DIST += $(ESX_GENERATED_STAMP)
-
-$(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP)
-
-$(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \
- $(srcdir)/esx/esx_vi_generator.py
-   $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/esx/esx_vi_generator.py 
\
- && touch $@
-
-MAINTAINERCLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP)
-
-
-if WITH_ESX
-noinst_LTLIBRARIES += libvirt_driver_esx.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_esx.la
-libvirt_driver_esx_la_CFLAGS = $(CURL_CFLAGS) \
-   -I$(srcdir)/conf -I$(srcdir)/vmx $(AM_CFLAGS)
-libvirt_driver_esx_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_esx_la_LIBADD = $(CURL_LIBS)
-libvirt_driver_esx_la_SOURCES = $(ESX_DRIVER_SOURCES)
-libvirt_driver_esx_la_DEPENDENCIES = $(ESX_DRIVER_GENERATED)
-endif WITH_ESX
-
 
 BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED)
 
@@ -2097,8 +2040,6 @@ EXTRA_DIST += \
$(VBOX_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
-   $(ESX_DRIVER_SOURCES) \
-   $(ESX_DRIVER_EXTRA_DIST) \
$(HYPERV_DRIVER_SOURCES) \
$(HYPERV_DRIVER_EXTRA_DIST) \
$(VZ_DRIVER_SOURCES) \
@@ -2289,12 +2230,6 @@ else ! WITH_LINUX
 SYM_FILES +=

[libvirt] [PATCH v1 07/16] make: split vbox driver build rules into vbox/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am  | 50 +--
 src/vbox/Makefile.inc.am | 76 
 2 files changed, 77 insertions(+), 49 deletions(-)
 create mode 100644 src/vbox/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 0c1cf924e8..6100325595 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,6 +79,7 @@ include test/Makefile.inc.am
 include esx/Makefile.inc.am
 include hyperv/Makefile.inc.am
 include vmware/Makefile.inc.am
+include vbox/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -781,8 +782,6 @@ DRIVER_SOURCE_FILES += \
$(REMOTE_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
-   $(VBOX_DRIVER_SOURCES) \
-   vbox/vbox_tmpl.c \
$(XEN_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(NULL)
@@ -914,30 +913,6 @@ OPENVZ_DRIVER_SOURCES = \
openvz/openvz_driver.c openvz/openvz_driver.h \
openvz/openvz_util.c openvz/openvz_util.h
 
-VBOX_DRIVER_SOURCES = \
-   vbox/vbox_glue.c vbox/vbox_glue.h \
-   vbox/vbox_driver.c vbox/vbox_driver.h \
-   vbox/vbox_snapshot_conf.c vbox/vbox_snapshot_conf.h \
-   vbox/vbox_V4_0.c vbox/vbox_CAPI_v4_0.h \
-   vbox/vbox_V4_1.c vbox/vbox_CAPI_v4_1.h \
-   vbox/vbox_V4_2.c vbox/vbox_CAPI_v4_2.h \
-   vbox/vbox_V4_2_20.c vbox/vbox_CAPI_v4_2_20.h \
-   vbox/vbox_V4_3.c vbox/vbox_CAPI_v4_3.h \
-   vbox/vbox_V4_3_4.c vbox/vbox_CAPI_v4_3_4.h \
-   vbox/vbox_V5_0.c vbox/vbox_CAPI_v5_0.h \
-   vbox/vbox_V5_1.c vbox/vbox_CAPI_v5_1.h \
-   vbox/vbox_V5_2.c vbox/vbox_CAPI_v5_2.h \
-   vbox/vbox_common.c vbox/vbox_common.h \
-   vbox/vbox_uniformed_api.h \
-   vbox/vbox_get_driver.h \
-   vbox/vbox_network.c \
-   vbox/vbox_storage.c
-
-VBOX_DRIVER_EXTRA_DIST = \
-   vbox/vbox_tmpl.c vbox/README \
-   vbox/vbox_MSCOMGlue.c vbox/vbox_MSCOMGlue.h \
-   vbox/vbox_XPCOMCGlue.c vbox/vbox_XPCOMCGlue.h
-
 QEMU_DRIVER_SOURCES = \
qemu/qemu_agent.c qemu/qemu_agent.h \
qemu/qemu_alias.c qemu/qemu_alias.h \
@@ -1415,27 +1390,6 @@ libvirt_driver_openvz_la_CFLAGS = \
 libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES)
 endif WITH_OPENVZ
 
-if WITH_VBOX
-noinst_LTLIBRARIES += \
-   libvirt_driver_vbox_impl.la
-libvirt_driver_vbox_la_SOURCES =
-libvirt_driver_vbox_la_LIBADD = libvirt_driver_vbox_impl.la
-mod_LTLIBRARIES += \
-   libvirt_driver_vbox.la
-libvirt_driver_vbox_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_vbox_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-libvirt_driver_vbox_impl_la_CFLAGS = \
-   -I$(srcdir)/conf \
-   $(AM_CFLAGS) \
-   -DVBOX_DRIVER
-libvirt_driver_vbox_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_vbox_impl_la_LIBADD =  $(DLOPEN_LIBS) \
-   $(WIN32_EXTRA_LIBS) \
-   $(LIBXML_LIBS)
-libvirt_driver_vbox_impl_la_SOURCES = $(VBOX_DRIVER_SOURCES)
-endif WITH_VBOX
-
 if WITH_XENAPI
 noinst_LTLIBRARIES += libvirt_driver_xenapi.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
@@ -1982,7 +1936,6 @@ EXTRA_DIST += \
$(QEMU_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
$(OPENVZ_DRIVER_SOURCES) \
-   $(VBOX_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
@@ -2009,7 +1962,6 @@ EXTRA_DIST += \
$(SECURITY_DRIVER_APPARMOR_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(SECRET_UTIL_SOURCES) \
-   $(VBOX_DRIVER_EXTRA_DIST) \
$(XENCONFIG_SOURCES) \
$(XENCONFIG_LIBXL_SOURCES) \
$(ACCESS_DRIVER_POLKIT_POLICY)
diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am
new file mode 100644
index 00..8c76f84e82
--- /dev/null
+++ b/src/vbox/Makefile.inc.am
@@ -0,0 +1,76 @@
+VBOX_DRIVER_SOURCES = \
+   vbox/vbox_glue.c \
+   vbox/vbox_glue.h \
+   vbox/vbox_driver.c \
+   vbox/vbox_driver.h \
+   vbox/vbox_snapshot_conf.c \
+   vbox/vbox_snapshot_conf.h \
+   vbox/vbox_V4_0.c \
+   vbox/vbox_CAPI_v4_0.h \
+   vbox/vbox_V4_1.c \
+   vbox/vbox_CAPI_v4_1.h \
+   vbox/vbox_V4_2.c \
+   vbox/vbox_CAPI_v4_2.h \
+   vbox/vbox_V4_2_20.c \
+   vbox/vbox_CAPI_v4_2_20.h \
+   vbox/vbox_V4_3.c \
+   vbox/vbox_CAPI_v4_3.h \
+   vbox/vbox_V4_3_4.c \
+   vbox/vbox_CAPI_v4_3_4.h \
+   vbox/vbox_V5_0.c \
+   vbox/vbox_CAPI_v5_0.h \
+   vbox/vbox_V5_1.c \
+   vbox/vbox_CAPI_v5_1.h \
+   vbox/vbox_V5_2.c \
+   vbox/vbox_CAPI_v5_2.h \
+   vbox/vbox_common.c \
+

[libvirt] [PATCH v1 00/16] Start to modularize src/Makefile.am

2018-02-22 Thread Daniel P . Berrangé

The src/Makefile.am is quite large and has quite poor grouping of rules
/ variables / etc. This makes it increasingly hard to identify all the
rules relating to a particular area of code.

Traditionally one might create Makefile.am's in each sub-directory and
let make recurse into each. Recursive make is quite a bad idea in
general though because it harms parallelization and means that make does
not have a full view of dependencies.

This series thus takes a different approach to modularization which is
to make use of the "include" statement to pull in makefile fragments
from subdirectories.  automake fully expands all "include" statements
when generating the Makefile.in, so we still end up with a single
monolithic file for the eventual build. Aside from ensuring make still
has a full view of dependencies, this also means that all variables are
still in a global namespace.

In doing this split, I've taken the opportunity to santize the variable
declarations into a consistent style. Any variable that is assigned more
than one value now uses line continuations with exactly one value per
line and a trailing $(NULL). It would be nice to enforce this style with
a syntax-check rule but I've not figured this out yet.

This series only moves the virt drivers. So there's obviously a further
series to follow behind this to finish the job for other drivers.

Daniel P. Berrangé (16):
  make: split UML driver build rules into uml/Makefile.inc.am
  make: split PHyp driver build rules into phyp/Makefile.inc.am
  make: split test driver build rules into test/Makefile.inc.am
  make: split ESX driver build rules into esx/Makefile.inc.am
  make: split hyperv driver build rules into hyperv/Makefile.inc.am
  make: split vmware driver build rules into vmware/Makefile.inc.am
  make: split vbox driver build rules into vbox/Makefile.inc.am
  make: split openvz driver build rules into openvz/Makefile.inc.am
  make: split qemu driver build rules into qemu/Makefile.inc.am
  make: split bhyve driver build rules into bhyve/Makefile.inc.am
  make: split xenconfig driver build rules into
xenconfig/Makefile.inc.am
  make: split libxl driver build rules into libxl/Makefile.inc.am
  make: split xen driver build rules into xen/Makefile.inc.am
  make: split xenapi driver build rules into xenapi/Makefile.inc.am
  make: split vz driver build rules into vz/Makefile.inc.am
  make: split lxc driver build rules into lxc/Makefile.inc.am

 src/Makefile.am   | 872 +++---
 src/bhyve/Makefile.inc.am |  73 
 src/esx/Makefile.inc.am   |  90 +
 src/hyperv/Makefile.inc.am|  59 +++
 src/libxl/Makefile.inc.am | 104 +
 src/lxc/Makefile.inc.am   | 207 ++
 src/openvz/Makefile.inc.am|  28 ++
 src/phyp/Makefile.inc.am  |  19 +
 src/qemu/Makefile.inc.am  | 148 +++
 src/test/Makefile.inc.am  |  26 ++
 src/uml/Makefile.inc.am   |  46 +++
 src/vbox/Makefile.inc.am  |  76 
 src/vmware/Makefile.inc.am|  27 ++
 src/vz/Makefile.inc.am|  38 ++
 src/xen/Makefile.inc.am   |  67 
 src/xenapi/Makefile.inc.am|  28 ++
 src/xenconfig/Makefile.inc.am |  28 ++
 17 files changed, 1122 insertions(+), 814 deletions(-)
 create mode 100644 src/bhyve/Makefile.inc.am
 create mode 100644 src/esx/Makefile.inc.am
 create mode 100644 src/hyperv/Makefile.inc.am
 create mode 100644 src/libxl/Makefile.inc.am
 create mode 100644 src/lxc/Makefile.inc.am
 create mode 100644 src/openvz/Makefile.inc.am
 create mode 100644 src/phyp/Makefile.inc.am
 create mode 100644 src/qemu/Makefile.inc.am
 create mode 100644 src/test/Makefile.inc.am
 create mode 100644 src/uml/Makefile.inc.am
 create mode 100644 src/vbox/Makefile.inc.am
 create mode 100644 src/vmware/Makefile.inc.am
 create mode 100644 src/vz/Makefile.inc.am
 create mode 100644 src/xen/Makefile.inc.am
 create mode 100644 src/xenapi/Makefile.inc.am
 create mode 100644 src/xenconfig/Makefile.inc.am

-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v1 03/16] make: split test driver build rules into test/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am  | 21 +
 src/test/Makefile.inc.am | 26 ++
 2 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 src/test/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 15549ec5b8..bec7930c2b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,6 +72,7 @@ libvirt_la_BUILT_LIBADD =
 
 include uml/Makefile.inc.am
 include phyp/Makefile.inc.am
+include test/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -776,7 +777,6 @@ DRIVER_SOURCE_FILES += \
$(REMOTE_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
-   $(TEST_DRIVER_SOURCES) \
$(VBOX_DRIVER_SOURCES) \
vbox/vbox_tmpl.c \
$(VMWARE_DRIVER_SOURCES) \
@@ -824,11 +824,6 @@ check-local: check-protocol check-symfile check-symsorting 
\
check-aclperms check-admin-symfile check-admin-symsorting
 .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)
 
-# Mock driver, covering domains, storage, networks, etc
-TEST_DRIVER_SOURCES = \
-   test/test_driver.c test/test_driver.h
-TEST_DRIVER_ASSETS = test/test-screenshot.png
-
 # Now the Hypervisor specific drivers
 XEN_DRIVER_SOURCES = \
xen/block_stats.c xen/block_stats.h \
@@ -1338,18 +1333,6 @@ GENERATED_SYM_FILES = \
libvirt_admin.syms libvirt_admin.def \
$(NULL)
 
-if WITH_TEST
-
-driver_test_asset_DATA = $(TEST_DRIVER_ASSETS)
-driver_test_assetdir = $(pkgdatadir)
-
-noinst_LTLIBRARIES += libvirt_driver_test.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_test.la
-libvirt_driver_test_la_CFLAGS = \
-   -I$(srcdir)/conf $(AM_CFLAGS)
-libvirt_driver_test_la_SOURCES = $(TEST_DRIVER_SOURCES)
-endif WITH_TEST
-
 if WITH_REMOTE
 noinst_LTLIBRARIES += libvirt_driver_remote.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_remote.la
@@ -2106,8 +2089,6 @@ access/viraccessapichecklxc.c: 
$(srcdir)/rpc/gendispatch.pl \
 
 # Add all conditional sources just in case...
 EXTRA_DIST += \
-   $(TEST_DRIVER_SOURCES) \
-   $(TEST_DRIVER_ASSETS) \
$(REMOTE_DRIVER_SOURCES) \
$(XEN_DRIVER_SOURCES) \
$(QEMU_DRIVER_SOURCES) \
diff --git a/src/test/Makefile.inc.am b/src/test/Makefile.inc.am
new file mode 100644
index 00..d52c281545
--- /dev/null
+++ b/src/test/Makefile.inc.am
@@ -0,0 +1,26 @@
+TEST_DRIVER_SOURCES = \
+   test/test_driver.c \
+   test/test_driver.h \
+   $(NULL)
+TEST_DRIVER_ASSETS = test/test-screenshot.png
+
+DRIVER_SOURCE_FILES += $(TEST_DRIVER_SOURCES)
+
+EXTRA_DIST += \
+   $(TEST_DRIVER_SOURCES) \
+   $(TEST_DRIVER_ASSETS) \
+   $(NULL)
+
+if WITH_TEST
+
+driver_test_asset_DATA = $(TEST_DRIVER_ASSETS)
+driver_test_assetdir = $(pkgdatadir)
+
+noinst_LTLIBRARIES += libvirt_driver_test.la
+libvirt_la_BUILT_LIBADD += libvirt_driver_test.la
+libvirt_driver_test_la_CFLAGS = \
+   -I$(srcdir)/conf \
+   $(AM_CFLAGS) \
+   $(NULL)
+libvirt_driver_test_la_SOURCES = $(TEST_DRIVER_SOURCES)
+endif WITH_TEST
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v1 13/16] make: split xen driver build rules into xen/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am | 39 +---
 src/xen/Makefile.inc.am | 67 +
 2 files changed, 68 insertions(+), 38 deletions(-)
 create mode 100644 src/xen/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 46a5210f8a..1692ed6304 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,6 +92,7 @@ include qemu/Makefile.inc.am
 include bhyve/Makefile.inc.am
 include xenconfig/Makefile.inc.am
 include libxl/Makefile.inc.am
+include xen/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -789,7 +790,6 @@ DRIVER_SOURCE_FILES += \
$(REMOTE_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
-   $(XEN_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(NULL)
 
@@ -801,7 +801,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
$(NWFILTER_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
-   $(XEN_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
$(NULL)
 
@@ -830,17 +829,6 @@ check-local: check-protocol check-symfile check-symsorting 
\
check-aclperms check-admin-symfile check-admin-symsorting
 .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct)
 
-# Now the Hypervisor specific drivers
-XEN_DRIVER_SOURCES = \
-   xen/block_stats.c xen/block_stats.h \
-   xen/xen_hypervisor.c xen/xen_hypervisor.h \
-   xen/xen_driver.c xen/xen_driver.h \
-   xen/xend_internal.c xen/xend_internal.h \
-   xen/xm_internal.c xen/xm_internal.h \
-   xen/xs_internal.c xen/xs_internal.h
-if WITH_XEN_INOTIFY
-XEN_DRIVER_SOURCES += xen/xen_inotify.c xen/xen_inotify.h
-endif WITH_XEN_INOTIFY
 
 LXC_MONITOR_PROTOCOL_GENERATED = \
lxc/lxc_monitor_protocol.h \
@@ -1277,24 +1265,6 @@ EXTRA_DIST += \
$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \
   $< $(srcdir)/$(subst $(srcdir)/,,$@)
 
-if WITH_XEN
-noinst_LTLIBRARIES += libvirt_driver_xen_impl.la
-libvirt_driver_xen_la_SOURCES =
-libvirt_driver_xen_la_LIBADD = libvirt_driver_xen_impl.la
-mod_LTLIBRARIES += libvirt_driver_xen.la
-libvirt_driver_xen_la_LIBADD += libvirt.la ../gnulib/lib/libgnu.la
-libvirt_driver_xen_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
-libvirt_driver_xen_impl_la_CFLAGS = \
-   $(XEN_CFLAGS) \
-   -I$(srcdir)/access \
-   -I$(srcdir)/conf \
-   -I$(srcdir)/xenconfig \
-   $(AM_CFLAGS)
-libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) libvirt_xenconfig.la
-libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES)
-endif WITH_XEN
 
 if WITH_XENAPI
 noinst_LTLIBRARIES += libvirt_driver_xenapi.la
@@ -1751,7 +1721,6 @@ access/viraccessapichecklxc.c: 
$(srcdir)/rpc/gendispatch.pl \
 # Add all conditional sources just in case...
 EXTRA_DIST += \
$(REMOTE_DRIVER_SOURCES) \
-   $(XEN_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
@@ -3118,9 +3087,6 @@ if WITH_LXC
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc"
 endif WITH_LXC
-if WITH_XEN
-   $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen"
-endif WITH_XEN
 if WITH_NETWORK
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq"
@@ -3162,9 +3128,6 @@ if WITH_LXC
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||:
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||:
 endif WITH_LXC
-if WITH_XEN
-   rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||:
-endif WITH_XEN
 if WITH_NETWORK
rm -f $(DESTDIR)$(confdir)/qemu/networks/autostart/default.xml
rm -f $(DESTDIR)$(confdir)/qemu/networks/default.xml
diff --git a/src/xen/Makefile.inc.am b/src/xen/Makefile.inc.am
new file mode 100644
index 00..85260251ec
--- /dev/null
+++ b/src/xen/Makefile.inc.am
@@ -0,0 +1,67 @@
+XEN_DRIVER_SOURCES = \
+   xen/block_stats.c \
+   xen/block_stats.h \
+   xen/xen_hypervisor.c \
+   xen/xen_hypervisor.h \
+   xen/xen_driver.c \
+   xen/xen_driver.h \
+   xen/xend_internal.c \
+   xen/xend_internal.h \
+   xen/xm_internal.c \
+   xen/xm_internal.h \
+   xen/xs_internal.c \
+   xen/xs_internal.h \
+   $(NULL)
+
+XEN_DRIVER_INOTIFY_SOURCES = \
+   xen/xen_inotify.c \
+   xen/xen_inotify.h \
+   $(NULL)
+
+if WITH_XEN_INOTIFY
+XEN_DRIVER_SOURCES += $(XEN_DRIVER_INOTIFY_SOURCES)
+endif WITH_XEN_INOTIFY
+
+DRIVER_SOURCE_FILES += $(XEN_DRIVER_SOURCES)
+STATEFUL_DRIVER_SOURCE_FILES +=

[libvirt] [PATCH v1 05/16] make: split hyperv driver build rules into hyperv/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am| 47 +---
 src/hyperv/Makefile.inc.am | 59 ++
 2 files changed, 60 insertions(+), 46 deletions(-)
 create mode 100644 src/hyperv/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b952bb00e2..a5986cee99 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -77,6 +77,7 @@ include uml/Makefile.inc.am
 include phyp/Makefile.inc.am
 include test/Makefile.inc.am
 include esx/Makefile.inc.am
+include hyperv/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -765,7 +766,6 @@ check-drivername:
 EXTRA_DIST += check-drivername.pl
 
 DRIVER_SOURCE_FILES += \
-   $(HYPERV_DRIVER_SORUCES) \
$(INTERFACE_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
@@ -984,24 +984,6 @@ LIBXL_DRIVER_SOURCES = \
libxl/libxl_logger.c libxl/libxl_logger.h \
libxl/libxl_migration.c libxl/libxl_migration.h
 
-HYPERV_DRIVER_SOURCES = \
-   hyperv/hyperv_private.h \
-   hyperv/hyperv_driver.c hyperv/hyperv_driver.h \
-   hyperv/hyperv_util.c hyperv/hyperv_util.h \
-   hyperv/hyperv_wmi.c hyperv/hyperv_wmi.h \
-   hyperv/hyperv_wmi_classes.c hyperv/hyperv_wmi_classes.h \
-   hyperv/openwsman.h
-
-HYPERV_DRIVER_GENERATED = \
-   hyperv/hyperv_wmi_classes.generated.c \
-   hyperv/hyperv_wmi_classes.generated.h \
-   hyperv/hyperv_wmi_classes.generated.typedef
-
-HYPERV_DRIVER_EXTRA_DIST = \
-   hyperv/hyperv_wmi_generator.input \
-   hyperv/hyperv_wmi_generator.py \
-   $(HYPERV_DRIVER_GENERATED)
-
 VZ_DRIVER_SOURCES = \
vz/vz_driver.h \
vz/vz_driver.c \
@@ -1584,31 +1566,6 @@ EXTRA_DIST += lxc/lxc.conf lxc/libvirtd_lxc.aug 
lxc/test_libvirtd_lxc.aug.in
 
 
 
-BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED)
-
-HYPERV_GENERATED_STAMP = .hyperv_wmi_generator.stamp
-
-EXTRA_DIST += $(HYPERV_GENERATED_STAMP)
-
-$(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP)
-
-$(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \
-$(srcdir)/hyperv/hyperv_wmi_generator.py
-   $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) \
- $(srcdir)/hyperv/hyperv_wmi_generator.py \
- && touch $@
-
-MAINTAINERCLEANFILES += $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP)
-
-if WITH_HYPERV
-noinst_LTLIBRARIES += libvirt_driver_hyperv.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_hyperv.la
-libvirt_driver_hyperv_la_CFLAGS = $(OPENWSMAN_CFLAGS) \
-   -I$(srcdir)/conf $(AM_CFLAGS)
-libvirt_driver_hyperv_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_hyperv_la_LIBADD = $(OPENWSMAN_LIBS)
-libvirt_driver_hyperv_la_SOURCES = $(HYPERV_DRIVER_SOURCES)
-endif WITH_HYPERV
 
 if WITH_VZ
 noinst_LTLIBRARIES += libvirt_driver_vz_impl.la
@@ -2040,8 +1997,6 @@ EXTRA_DIST += \
$(VBOX_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
-   $(HYPERV_DRIVER_SOURCES) \
-   $(HYPERV_DRIVER_EXTRA_DIST) \
$(VZ_DRIVER_SOURCES) \
$(BHYVE_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am
new file mode 100644
index 00..1478d77b08
--- /dev/null
+++ b/src/hyperv/Makefile.inc.am
@@ -0,0 +1,59 @@
+HYPERV_DRIVER_SOURCES = \
+   hyperv/hyperv_private.h \
+   hyperv/hyperv_driver.c \
+   hyperv/hyperv_driver.h \
+   hyperv/hyperv_util.c \
+   hyperv/hyperv_util.h \
+   hyperv/hyperv_wmi.c \
+   hyperv/hyperv_wmi.h \
+   hyperv/hyperv_wmi_classes.c \
+   hyperv/hyperv_wmi_classes.h \
+   hyperv/openwsman.h \
+   $(NULL)
+
+HYPERV_DRIVER_GENERATED = \
+   hyperv/hyperv_wmi_classes.generated.c \
+   hyperv/hyperv_wmi_classes.generated.h \
+   hyperv/hyperv_wmi_classes.generated.typedef \
+   $(NULL)
+
+HYPERV_GENERATED_STAMP = .hyperv_wmi_generator.stamp
+
+HYPERV_DRIVER_EXTRA_DIST = \
+   hyperv/hyperv_wmi_generator.input \
+   hyperv/hyperv_wmi_generator.py \
+   $(HYPERV_DRIVER_GENERATED) \
+   $(HYPERV_GENERATED_STAMP) \
+   $(NULL)
+
+DRIVER_SOURCE_FILES += $(HYPERV_DRIVER_SORUCES)
+
+EXTRA_DIST += \
+   $(HYPERV_DRIVER_SORUCES) \
+   $(HYPERV_DRIVER_EXTRA_DIST) \
+   $(NULL)
+
+BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED)
+
+$(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP)
+
+$(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \
+$(srcdir)/hyperv/hyperv_wmi_generator.py
+   $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) \
+ $(srcdir)/hyperv/hyperv_wmi_generator.py \
+

[libvirt] [PATCH v1 14/16] make: split xenapi driver build rules into xenapi/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am| 18 +-
 src/xenapi/Makefile.inc.am | 28 
 2 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 src/xenapi/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1692ed6304..1fcb864c21 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,6 +93,7 @@ include bhyve/Makefile.inc.am
 include xenconfig/Makefile.inc.am
 include libxl/Makefile.inc.am
 include xen/Makefile.inc.am
+include xenapi/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -790,7 +791,6 @@ DRIVER_SOURCE_FILES += \
$(REMOTE_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
$(STORAGE_DRIVER_SOURCES) \
-   $(XENAPI_DRIVER_SOURCES) \
$(NULL)
 
 STATEFUL_DRIVER_SOURCE_FILES += \
@@ -900,11 +900,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
$(DATATYPES_SOURCES) \
security/virt-aa-helper.c
 
-XENAPI_DRIVER_SOURCES = \
-   xenapi/xenapi_driver.c xenapi/xenapi_driver.h \
-   xenapi/xenapi_driver_private.h \
-   xenapi/xenapi_utils.c xenapi/xenapi_utils.h
-
 VZ_DRIVER_SOURCES = \
vz/vz_driver.h \
vz/vz_driver.c \
@@ -1266,16 +1261,6 @@ EXTRA_DIST += \
   $< $(srcdir)/$(subst $(srcdir)/,,$@)
 
 
-if WITH_XENAPI
-noinst_LTLIBRARIES += libvirt_driver_xenapi.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
-libvirt_driver_xenapi_la_CFLAGS = $(XENAPI_CFLAGS) $(CURL_CFLAGS) \
-   -I$(srcdir)/conf -I$(srcdir)/xenconfig $(AM_CFLAGS)
-libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_xenapi_la_LIBADD = $(XENAPI_LIBS) $(CURL_LIBS)
-libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES)
-endif WITH_XENAPI
-
 
 
 
@@ -1722,7 +1707,6 @@ access/viraccessapichecklxc.c: 
$(srcdir)/rpc/gendispatch.pl \
 EXTRA_DIST += \
$(REMOTE_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
-   $(XENAPI_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
$(NETWORK_DRIVER_SOURCES) \
$(INTERFACE_DRIVER_SOURCES) \
diff --git a/src/xenapi/Makefile.inc.am b/src/xenapi/Makefile.inc.am
new file mode 100644
index 00..4640e9943f
--- /dev/null
+++ b/src/xenapi/Makefile.inc.am
@@ -0,0 +1,28 @@
+XENAPI_DRIVER_SOURCES = \
+   xenapi/xenapi_driver.c \
+   xenapi/xenapi_driver.h \
+   xenapi/xenapi_driver_private.h \
+   xenapi/xenapi_utils.c \
+   xenapi/xenapi_utils.h \
+   $(NULL)
+
+DRIVER_SOURCE_FILES += $(XENAPI_DRIVER_SOURCES)
+EXTRA_DIST += $(XENAPI_DRIVER_SOURCES)
+
+if WITH_XENAPI
+noinst_LTLIBRARIES += libvirt_driver_xenapi.la
+libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
+libvirt_driver_xenapi_la_CFLAGS = \
+   $(XENAPI_CFLAGS) \
+   $(CURL_CFLAGS) \
+   -I$(srcdir)/conf \
+   -I$(srcdir)/xenconfig \
+   $(AM_CFLAGS) \
+   $(NULL)
+libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS)
+libvirt_driver_xenapi_la_LIBADD = \
+   $(XENAPI_LIBS) \
+   $(CURL_LIBS) \
+   $(NULL)
+libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES)
+endif WITH_XENAPI
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v1 08/16] make: split openvz driver build rules into openvz/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am| 22 +-
 src/openvz/Makefile.inc.am | 28 
 2 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 src/openvz/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 6100325595..7927bcbb04 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -80,6 +80,7 @@ include esx/Makefile.inc.am
 include hyperv/Makefile.inc.am
 include vmware/Makefile.inc.am
 include vbox/Makefile.inc.am
+include openvz/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -776,7 +777,6 @@ DRIVER_SOURCE_FILES += \
$(NODE_DEVICE_DRIVER_HAL_SOURCES) \
$(NODE_DEVICE_DRIVER_UDEV_SOURCES) \
$(NWFILTER_DRIVER_SOURCES) \
-   $(OPENVZ_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
$(QEMU_DRIVER_SOURCES) \
$(REMOTE_DRIVER_SOURCES) \
@@ -908,11 +908,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
$(DATATYPES_SOURCES) \
security/virt-aa-helper.c
 
-OPENVZ_DRIVER_SOURCES = \
-   openvz/openvz_conf.c openvz/openvz_conf.h \
-   openvz/openvz_driver.c openvz/openvz_driver.h \
-   openvz/openvz_util.c openvz/openvz_util.h
-
 QEMU_DRIVER_SOURCES = \
qemu/qemu_agent.c qemu/qemu_agent.h \
qemu/qemu_alias.c qemu/qemu_alias.h \
@@ -1382,14 +1377,6 @@ libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) 
libvirt_xenconfig.la
 libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES)
 endif WITH_XEN
 
-if WITH_OPENVZ
-noinst_LTLIBRARIES += libvirt_driver_openvz.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_openvz.la
-libvirt_driver_openvz_la_CFLAGS = \
-   -I$(srcdir)/conf $(AM_CFLAGS)
-libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES)
-endif WITH_OPENVZ
-
 if WITH_XENAPI
 noinst_LTLIBRARIES += libvirt_driver_xenapi.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
@@ -1935,7 +1922,6 @@ EXTRA_DIST += \
$(XEN_DRIVER_SOURCES) \
$(QEMU_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
-   $(OPENVZ_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
@@ -2130,12 +2116,6 @@ else ! WITH_REMOTE
 SYM_FILES += $(srcdir)/libvirt_remote.syms
 endif ! WITH_REMOTE
 
-if WITH_OPENVZ
-USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms
-else ! WITH_OPENVZ
-SYM_FILES += $(srcdir)/libvirt_openvz.syms
-endif ! WITH_OPENVZ
-
 if WITH_VMX
 USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms
 else ! WITH_VMX
diff --git a/src/openvz/Makefile.inc.am b/src/openvz/Makefile.inc.am
new file mode 100644
index 00..baad737362
--- /dev/null
+++ b/src/openvz/Makefile.inc.am
@@ -0,0 +1,28 @@
+OPENVZ_DRIVER_SOURCES = \
+   openvz/openvz_conf.c \
+   openvz/openvz_conf.h \
+   openvz/openvz_driver.c \
+   openvz/openvz_driver.h \
+   openvz/openvz_util.c \
+   openvz/openvz_util.h \
+   $(NULL)
+
+DRIVER_SOURCE_FILES += $(OPENVZ_DRIVER_SOURCES)
+
+EXTRA_DIST += $(OPENVZ_DRIVER_SOURCES)
+
+if WITH_OPENVZ
+noinst_LTLIBRARIES += libvirt_driver_openvz.la
+libvirt_la_BUILT_LIBADD += libvirt_driver_openvz.la
+libvirt_driver_openvz_la_CFLAGS = \
+   -I$(srcdir)/conf \
+   $(AM_CFLAGS) \
+   $(NULL)
+libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES)
+endif WITH_OPENVZ
+
+if WITH_OPENVZ
+USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms
+else ! WITH_OPENVZ
+SYM_FILES += $(srcdir)/libvirt_openvz.syms
+endif ! WITH_OPENVZ
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v1 02/16] make: split PHyp driver build rules into phyp/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am  | 18 +++---
 src/phyp/Makefile.inc.am | 19 +++
 2 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 src/phyp/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3c346b37aa..15549ec5b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,8 +68,10 @@ STATEFUL_DRIVER_SOURCE_FILES =
 noinst_LTLIBRARIES =
 mod_LTLIBRARIES =
 INSTALL_DATA_DIRS =
+libvirt_la_BUILT_LIBADD =
 
 include uml/Makefile.inc.am
+include phyp/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -770,7 +772,6 @@ DRIVER_SOURCE_FILES += \
$(NWFILTER_DRIVER_SOURCES) \
$(OPENVZ_DRIVER_SOURCES) \
$(VZ_DRIVER_SOURCES) \
-   $(PHYP_DRIVER_SOURCES) \
$(QEMU_DRIVER_SOURCES) \
$(REMOTE_DRIVER_SOURCES) \
$(SECRET_DRIVER_SOURCES) \
@@ -910,9 +911,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES = \
$(DATATYPES_SOURCES) \
security/virt-aa-helper.c
 
-PHYP_DRIVER_SOURCES = \
-   phyp/phyp_driver.c phyp/phyp_driver.h
-
 OPENVZ_DRIVER_SOURCES = \
openvz/openvz_conf.c openvz/openvz_conf.h \
openvz/openvz_driver.c openvz/openvz_driver.h \
@@ -1261,7 +1259,7 @@ EXTRA_DIST += $(pkgdata_DATA)
 
 noinst_LTLIBRARIES += libvirt_util.la
 libvirt_la_LIBADD = $(libvirt_la_BUILT_LIBADD)
-libvirt_la_BUILT_LIBADD = libvirt_util.la
+libvirt_la_BUILT_LIBADD += libvirt_util.la
 libvirt_util_la_SOURCES = \
$(UTIL_SOURCES)
 libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \
@@ -1478,15 +1476,6 @@ libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) 
libvirt_xenconfig.la
 libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES)
 endif WITH_XEN
 
-if WITH_PHYP
-noinst_LTLIBRARIES += libvirt_driver_phyp.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_phyp.la
-libvirt_driver_phyp_la_LIBADD = $(SSH2_LIBS)
-libvirt_driver_phyp_la_CFLAGS = $(SSH2_CFLAGS) \
-   -I$(srcdir)/conf $(AM_CFLAGS)
-libvirt_driver_phyp_la_SOURCES = $(PHYP_DRIVER_SOURCES)
-endif WITH_PHYP
-
 if WITH_OPENVZ
 noinst_LTLIBRARIES += libvirt_driver_openvz.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_openvz.la
@@ -2124,7 +2113,6 @@ EXTRA_DIST += \
$(QEMU_DRIVER_SOURCES) \
$(LXC_DRIVER_SOURCES) \
$(OPENVZ_DRIVER_SOURCES) \
-   $(PHYP_DRIVER_SOURCES) \
$(VBOX_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(LIBXL_DRIVER_SOURCES) \
diff --git a/src/phyp/Makefile.inc.am b/src/phyp/Makefile.inc.am
new file mode 100644
index 00..496ff25266
--- /dev/null
+++ b/src/phyp/Makefile.inc.am
@@ -0,0 +1,19 @@
+PHYP_DRIVER_SOURCES = \
+   phyp/phyp_driver.c \
+   phyp/phyp_driver.h \
+   $(NULL)
+
+DRIVER_SOURCE_FILES += $(PHYP_DRIVER_SOURCES)
+EXTRA_DIST += $(PHYP_DRIVER_SOURCES)
+
+if WITH_PHYP
+noinst_LTLIBRARIES += libvirt_driver_phyp.la
+libvirt_la_BUILT_LIBADD += libvirt_driver_phyp.la
+libvirt_driver_phyp_la_LIBADD = $(SSH2_LIBS)
+libvirt_driver_phyp_la_CFLAGS = \
+   $(SSH2_CFLAGS) \
+   -I$(srcdir)/conf \
+   $(AM_CFLAGS) \
+   $(NULL)
+libvirt_driver_phyp_la_SOURCES = $(PHYP_DRIVER_SOURCES)
+endif WITH_PHYP
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v1 06/16] make: split vmware driver build rules into vmware/Makefile.inc.am

2018-02-22 Thread Daniel P . Berrangé

Signed-off-by: Daniel P. Berrangé 
---
 src/Makefile.am| 21 +
 src/vmware/Makefile.inc.am | 27 +++
 2 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 src/vmware/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a5986cee99..0c1cf924e8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,6 +78,7 @@ include phyp/Makefile.inc.am
 include test/Makefile.inc.am
 include esx/Makefile.inc.am
 include hyperv/Makefile.inc.am
+include vmware/Makefile.inc.am
 
 install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
 uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
@@ -782,7 +783,6 @@ DRIVER_SOURCE_FILES += \
$(STORAGE_DRIVER_SOURCES) \
$(VBOX_DRIVER_SOURCES) \
vbox/vbox_tmpl.c \
-   $(VMWARE_DRIVER_SOURCES) \
$(XEN_DRIVER_SOURCES) \
$(XENAPI_DRIVER_SOURCES) \
$(NULL)
@@ -914,10 +914,6 @@ OPENVZ_DRIVER_SOURCES = \
openvz/openvz_driver.c openvz/openvz_driver.h \
openvz/openvz_util.c openvz/openvz_util.h
 
-VMWARE_DRIVER_SOURCES = \
-   vmware/vmware_driver.c vmware/vmware_driver.h \
-   vmware/vmware_conf.c vmware/vmware_conf.h
-
 VBOX_DRIVER_SOURCES = \
vbox/vbox_glue.c vbox/vbox_glue.h \
vbox/vbox_driver.c vbox/vbox_driver.h \
@@ -1419,14 +1415,6 @@ libvirt_driver_openvz_la_CFLAGS = \
 libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES)
 endif WITH_OPENVZ
 
-if WITH_VMWARE
-noinst_LTLIBRARIES += libvirt_driver_vmware.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_vmware.la
-libvirt_driver_vmware_la_CFLAGS = \
-   -I$(srcdir)/conf -I$(srcdir)/vmx $(AM_CFLAGS)
-libvirt_driver_vmware_la_SOURCES = $(VMWARE_DRIVER_SOURCES)
-endif WITH_VMWARE
-
 if WITH_VBOX
 noinst_LTLIBRARIES += \
libvirt_driver_vbox_impl.la
@@ -2022,7 +2010,6 @@ EXTRA_DIST += \
$(SECRET_DRIVER_SOURCES) \
$(SECRET_UTIL_SOURCES) \
$(VBOX_DRIVER_EXTRA_DIST) \
-   $(VMWARE_DRIVER_SOURCES) \
$(XENCONFIG_SOURCES) \
$(XENCONFIG_LIBXL_SOURCES) \
$(ACCESS_DRIVER_POLKIT_POLICY)
@@ -2203,12 +2190,6 @@ else ! WITH_VMX
 SYM_FILES += $(srcdir)/libvirt_vmx.syms
 endif ! WITH_VMX
 
-if WITH_VMWARE
-USED_SYM_FILES += $(srcdir)/libvirt_vmware.syms
-else ! WITH_VMWARE
-SYM_FILES += $(srcdir)/libvirt_vmware.syms
-endif ! WITH_VMWARE
-
 if WITH_XENCONFIG
 USED_SYM_FILES += $(srcdir)/libvirt_xenconfig.syms
 else ! WITH_XENCONFIG
diff --git a/src/vmware/Makefile.inc.am b/src/vmware/Makefile.inc.am
new file mode 100644
index 00..0fbf866030
--- /dev/null
+++ b/src/vmware/Makefile.inc.am
@@ -0,0 +1,27 @@
+VMWARE_DRIVER_SOURCES = \
+   vmware/vmware_driver.c \
+   vmware/vmware_driver.h \
+   vmware/vmware_conf.c \
+   vmware/vmware_conf.h \
+   $(NULL)
+
+DRIVER_SOURCE_FILES += $(VMWARE_DRIVER_SOURCES)
+
+EXTRA_DIST += $(VMWARE_DRIVER_SOURCES)
+
+if WITH_VMWARE
+noinst_LTLIBRARIES += libvirt_driver_vmware.la
+libvirt_la_BUILT_LIBADD += libvirt_driver_vmware.la
+libvirt_driver_vmware_la_CFLAGS = \
+   -I$(srcdir)/conf \
+   -I$(srcdir)/vmx \
+   $(AM_CFLAGS) \
+   $(NULL)
+libvirt_driver_vmware_la_SOURCES = $(VMWARE_DRIVER_SOURCES)
+endif WITH_VMWARE
+
+if WITH_VMWARE
+USED_SYM_FILES += $(srcdir)/libvirt_vmware.syms
+else ! WITH_VMWARE
+SYM_FILES += $(srcdir)/libvirt_vmware.syms
+endif ! WITH_VMWARE
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH v2 0/6] port allocator: make used port bitmap global etc

2018-02-22 Thread Michal Privoznik

On 02/22/2018 01:46 PM, Nikolay Shirokovskiy wrote:
> 
> 
> On 22.02.2018 15:45, Michal Privoznik wrote:
>> On 02/06/2018 10:09 AM, Nikolay Shirokovskiy wrote:
>>> This patch set addresses issue(s) described in [1] and the core of
>>> changes go to the first patch. The others are cleanups and
>>> refactorings.
>>>
>>> Diff from v1:
>>> - rename virPortRange to virPortAllocatorRange (virPortRange is occupied)
>>> - release ports in libxl and bhyve tests 
>>> - overload bind syscall for libxl and bhyve tests
>>> - fix undefined behaviour on port release on error paths in qemu test
>>>
>>> WARNING! I did not compile with bhyve.
>>>
>>> [1] https://www.redhat.com/archives/libvir-list/2017-December/msg00600.html
>>>
>>> Nikolay Shirokovskiy (6):
>>>   port allocator: make used port bitmap global
>>>   port allocator: remove range on manual port reserving
>>>   port allocator: remove range check in release function
>>>   port allocator: drop skip bind check flag
>>>   port allocator: remove release functionality from set used
>>>   port allocator: make port range constant object
>>>
>>>  src/bhyve/bhyve_command.c  |   4 +-
>>>  src/bhyve/bhyve_driver.c   |   5 +-
>>>  src/bhyve/bhyve_process.c  |   7 +-
>>>  src/bhyve/bhyve_utils.h|   2 +-
>>>  src/libvirt_private.syms   |   3 +-
>>>  src/libxl/libxl_conf.c |   8 +-
>>>  src/libxl/libxl_conf.h |  12 +--
>>>  src/libxl/libxl_domain.c   |   3 +-
>>>  src/libxl/libxl_driver.c   |  17 ++---
>>>  src/libxl/libxl_migration.c|   4 +-
>>>  src/qemu/qemu_conf.h   |  12 +--
>>>  src/qemu/qemu_driver.c |  27 +++
>>>  src/qemu/qemu_migration.c  |  12 +--
>>>  src/qemu/qemu_process.c|  55 --
>>>  src/util/virportallocator.c| 166 
>>> -
>>>  src/util/virportallocator.h|  25 +++
>>>  tests/bhyvexml2argvmock.c  |   7 ++
>>>  tests/bhyvexml2argvtest.c  |  10 ++-
>>>  tests/libxlxml2domconfigtest.c |  12 ++-
>>>  tests/virmocklibxl.c   |   7 ++
>>>  tests/virportallocatortest.c   |  53 +++--
>>>  21 files changed, 237 insertions(+), 214 deletions(-)
>>>
>>
>> ACK. Although, in order to push these the commits need to bee
>> Signed-off-by. Do you want me to add the line there or do you want to
>> repost?
>>
> Please, add it on my behalf.

Added and pushed. Thanks.

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH] virLogGetOutputs: remove unnecessary braces

2018-02-22 Thread Ján Tomko

Commit 9275def reduced the if block to one line without removing the
braces.

Signed-off-by: Ján Tomko 
---

I pushed this yesterday as a build fix, but forgot to send an e-mail.

 src/util/virlog.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/util/virlog.c b/src/util/virlog.c
index c03f4fb14..dd927f0ba 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -1219,9 +1219,8 @@ virLogGetOutputs(void)
 }
 }
 
-if (virBufferError()) {
+if (virBufferError())
 goto error;
-}
 
 virLogUnlock();
 return virBufferContentAndReset();
-- 
2.13.6

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH] rpm: don't enable fuse on RHEL-6

2018-02-22 Thread Daniel P . Berrangé

Fuse was recently enabled whereever LXC is enabled:

  commit 34783a9e6b9c3d8850db878fc323c1ff40703ea6
  Author: Jiri Denemark 
  Date:   Fri Feb 9 13:42:50 2018 +0100

spec: Enable fuse only if LXC is enabled

Unfortunately the version of Fuse in RHEL-6 is too old for libvirt's
needs, but we still have LXC enabled there.

Signed-off-by: Daniel P. Berrangé 
---

Pushed as a CI build fix

 libvirt.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index e1e902c5e4..1eca4e39d4 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -167,7 +167,7 @@
 %endif
 
 # fuse is used to provide virtualized /proc for LXC
-%if %{with_lxc}
+%if %{with_lxc} && 0%{?rhel} != 6
 %define with_fuse  0%{!?_without_fuse:1}
 %endif
 
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH v2 0/6] port allocator: make used port bitmap global etc

2018-02-22 Thread Nikolay Shirokovskiy



On 22.02.2018 15:45, Michal Privoznik wrote:
> On 02/06/2018 10:09 AM, Nikolay Shirokovskiy wrote:
>> This patch set addresses issue(s) described in [1] and the core of
>> changes go to the first patch. The others are cleanups and
>> refactorings.
>>
>> Diff from v1:
>> - rename virPortRange to virPortAllocatorRange (virPortRange is occupied)
>> - release ports in libxl and bhyve tests 
>> - overload bind syscall for libxl and bhyve tests
>> - fix undefined behaviour on port release on error paths in qemu test
>>
>> WARNING! I did not compile with bhyve.
>>
>> [1] https://www.redhat.com/archives/libvir-list/2017-December/msg00600.html
>>
>> Nikolay Shirokovskiy (6):
>>   port allocator: make used port bitmap global
>>   port allocator: remove range on manual port reserving
>>   port allocator: remove range check in release function
>>   port allocator: drop skip bind check flag
>>   port allocator: remove release functionality from set used
>>   port allocator: make port range constant object
>>
>>  src/bhyve/bhyve_command.c  |   4 +-
>>  src/bhyve/bhyve_driver.c   |   5 +-
>>  src/bhyve/bhyve_process.c  |   7 +-
>>  src/bhyve/bhyve_utils.h|   2 +-
>>  src/libvirt_private.syms   |   3 +-
>>  src/libxl/libxl_conf.c |   8 +-
>>  src/libxl/libxl_conf.h |  12 +--
>>  src/libxl/libxl_domain.c   |   3 +-
>>  src/libxl/libxl_driver.c   |  17 ++---
>>  src/libxl/libxl_migration.c|   4 +-
>>  src/qemu/qemu_conf.h   |  12 +--
>>  src/qemu/qemu_driver.c |  27 +++
>>  src/qemu/qemu_migration.c  |  12 +--
>>  src/qemu/qemu_process.c|  55 --
>>  src/util/virportallocator.c| 166 
>> -
>>  src/util/virportallocator.h|  25 +++
>>  tests/bhyvexml2argvmock.c  |   7 ++
>>  tests/bhyvexml2argvtest.c  |  10 ++-
>>  tests/libxlxml2domconfigtest.c |  12 ++-
>>  tests/virmocklibxl.c   |   7 ++
>>  tests/virportallocatortest.c   |  53 +++--
>>  21 files changed, 237 insertions(+), 214 deletions(-)
>>
> 
> ACK. Although, in order to push these the commits need to bee
> Signed-off-by. Do you want me to add the line there or do you want to
> repost?
> 
Please, add it on my behalf.

Nikolay

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH v2 0/6] port allocator: make used port bitmap global etc

2018-02-22 Thread Michal Privoznik

On 02/06/2018 10:09 AM, Nikolay Shirokovskiy wrote:
> This patch set addresses issue(s) described in [1] and the core of
> changes go to the first patch. The others are cleanups and
> refactorings.
> 
> Diff from v1:
> - rename virPortRange to virPortAllocatorRange (virPortRange is occupied)
> - release ports in libxl and bhyve tests 
> - overload bind syscall for libxl and bhyve tests
> - fix undefined behaviour on port release on error paths in qemu test
> 
> WARNING! I did not compile with bhyve.
> 
> [1] https://www.redhat.com/archives/libvir-list/2017-December/msg00600.html
> 
> Nikolay Shirokovskiy (6):
>   port allocator: make used port bitmap global
>   port allocator: remove range on manual port reserving
>   port allocator: remove range check in release function
>   port allocator: drop skip bind check flag
>   port allocator: remove release functionality from set used
>   port allocator: make port range constant object
> 
>  src/bhyve/bhyve_command.c  |   4 +-
>  src/bhyve/bhyve_driver.c   |   5 +-
>  src/bhyve/bhyve_process.c  |   7 +-
>  src/bhyve/bhyve_utils.h|   2 +-
>  src/libvirt_private.syms   |   3 +-
>  src/libxl/libxl_conf.c |   8 +-
>  src/libxl/libxl_conf.h |  12 +--
>  src/libxl/libxl_domain.c   |   3 +-
>  src/libxl/libxl_driver.c   |  17 ++---
>  src/libxl/libxl_migration.c|   4 +-
>  src/qemu/qemu_conf.h   |  12 +--
>  src/qemu/qemu_driver.c |  27 +++
>  src/qemu/qemu_migration.c  |  12 +--
>  src/qemu/qemu_process.c|  55 --
>  src/util/virportallocator.c| 166 
> -
>  src/util/virportallocator.h|  25 +++
>  tests/bhyvexml2argvmock.c  |   7 ++
>  tests/bhyvexml2argvtest.c  |  10 ++-
>  tests/libxlxml2domconfigtest.c |  12 ++-
>  tests/virmocklibxl.c   |   7 ++
>  tests/virportallocatortest.c   |  53 +++--
>  21 files changed, 237 insertions(+), 214 deletions(-)
> 

ACK. Although, in order to push these the commits need to bee
Signed-off-by. Do you want me to add the line there or do you want to
repost?

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 10/10] daemon: move logrotate files to src/remote/

2018-02-22 Thread Daniel P . Berrangé

On Thu, Feb 22, 2018 at 11:24:18AM +0100, Michal Privoznik wrote:
> On 02/21/2018 04:35 PM, Daniel P. Berrangé wrote:
> > Signed-off-by: Daniel P. Berrangé 
> > ---
> >  Makefile.am|   2 +-
> >  configure.ac   |   1 -
> >  daemon/Makefile.am | 117 
> > -
> >  src/Makefile.am|  45 +++-
> >  {daemon => src/remote}/libvirtd.libxl.logrotate.in |   0
> >  {daemon => src/remote}/libvirtd.logrotate.in   |   0
> >  {daemon => src/remote}/libvirtd.lxc.logrotate.in   |   0
> >  {daemon => src/remote}/libvirtd.qemu.logrotate.in  |   0
> >  {daemon => src/remote}/libvirtd.uml.logrotate.in   |   0
> >  9 files changed, 44 insertions(+), 121 deletions(-)
> >  delete mode 100644 daemon/Makefile.am
> >  rename {daemon => src/remote}/libvirtd.libxl.logrotate.in (100%)
> >  rename {daemon => src/remote}/libvirtd.logrotate.in (100%)
> >  rename {daemon => src/remote}/libvirtd.lxc.logrotate.in (100%)
> >  rename {daemon => src/remote}/libvirtd.qemu.logrotate.in (100%)
> >  rename {daemon => src/remote}/libvirtd.uml.logrotate.in (100%)
> 
> diff --git i/.gitignore w/.gitignore
> index 7ff6cec2f..e9036fa39 100644
> --- i/.gitignore
> +++ w/.gitignore
> @@ -65,2 +64,0 @@
> -/daemon/libvirtd*.logrotate
> -/daemon/libvirtd.policy
> @@ -142,0 +141,2 @@
> +/src/libvirtd*.logrotate
> +/src/libvirtd.policy

Hmm, I'll need to tweak .gitignore for earlier patches too in fact.

Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 05/10] daemon: move libvirtd code into src/remote/ directory

2018-02-22 Thread Daniel P . Berrangé

On Thu, Feb 22, 2018 at 11:24:24AM +0100, Michal Privoznik wrote:
> On 02/21/2018 04:35 PM, Daniel P. Berrangé wrote:
> > Having a daemon/ directory makes little sense from a code structure
> > point of view, as 90% of the code that is built into libvirtd already
> > lives in the src/ directory. The virtlockd and virlogd daemons also live
> > entirely in src/{locking,logging} directories. This moves the source
> > code for libvirtd into src/remote/, alongside the client code.
> > 
> > Signed-off-by: Daniel P. Berrangé 
> > ---
> >  .gitignore |   2 +
> >  daemon/Makefile.am | 125 
> > +
> >  src/Makefile.am|  93 ++-
> >  daemon/libvirtd.c => src/remote/remote_daemon.c|  10 +-
> >  daemon/libvirtd.h => src/remote/remote_daemon.h|  10 +-
> >  .../remote/remote_daemon_config.c  |  10 +-
> >  .../remote/remote_daemon_config.h  |  10 +-
> >  .../remote/remote_daemon_dispatch.c|  16 +--
> >  .../remote/remote_daemon_dispatch.h|  10 +-
> >  .../stream.c => src/remote/remote_daemon_stream.c  |   8 +-
> >  .../stream.h => src/remote/remote_daemon_stream.h  |  12 +-
> >  11 files changed, 136 insertions(+), 170 deletions(-)
> >  rename daemon/libvirtd.c => src/remote/remote_daemon.c (99%)
> >  rename daemon/libvirtd.h => src/remote/remote_daemon.h (93%)
> >  rename daemon/libvirtd-config.c => src/remote/remote_daemon_config.c (98%)
> >  rename daemon/libvirtd-config.h => src/remote/remote_daemon_config.h (92%)
> >  rename daemon/remote.c => src/remote/remote_daemon_dispatch.c (99%)
> >  rename daemon/remote.h => src/remote/remote_daemon_dispatch.h (85%)
> >  rename daemon/stream.c => src/remote/remote_daemon_stream.c (99%)>  rename 
> > daemon/stream.h => src/remote/remote_daemon_stream.h (85%)
> 
> Not that simple. Instead of pointing out in the patch, here's the diff
> you need to squash in:
> 
> 
> diff --git i/cfg.mk w/cfg.mk
> index 920b60917..3172822cf 100644
> --- i/cfg.mk
> +++ w/cfg.mk
> @@ -32,7 +32,7 @@ gnulib_dir = $(srcdir)/.gnulib
>  # List of additional files that we want to pick up in our POTFILES.in
>  # This is all gnulib files, as well as generated files for RPC code.
>  generated_files = \
> -  $(srcdir)/daemon/{lxc,qemu,remote}_dispatch.h \
> +  $(srcdir)/src/remote/remote_daemon_dispatch{_lxc,_qemu,_}_stubs.h \
>$(srcdir)/src/*/{admin_server,log_daemon,lock_daemon}_dispatch_stubs.h \

I squashed the rule into the next line instead

  -  $(srcdir)/daemon/{lxc,qemu,remote}_dispatch.h \
  -  $(srcdir)/src/*/{admin_server,log_daemon,lock_daemon}_dispatch_stubs.h \
  +  
$(srcdir)/src/*/{remote_daemon,admin_server,log_daemon,lock_daemon}_dispatch_*stubs.h
 \


> @@ -1116,17 +1116,26 @@ test-wrap-argv:
>  
>  # sc_po_check can fail if generated files are not built first
>  sc_po_check: \
> - $(srcdir)/daemon/remote_dispatch.h \
> - $(srcdir)/daemon/qemu_dispatch.h \
> + $(srcdir)/src/remote/lxc_client_bodies.h \
> + $(srcdir)/src/remote/qemu_client_bodies.h \

These two client_bodies.h additions are unrelated to this patch.

>   $(srcdir)/src/remote/remote_client_bodies.h \
> + $(srcdir)/src/remote/remote_daemon_dispatch_lxc_stubs.h \
> + $(srcdir)/src/remote/remote_daemon_dispatch_qemu_stubs.h \
> + $(srcdir)/src/remote/remote_daemon_dispatch_stubs.h \
>   $(srcdir)/src/admin/admin_server_dispatch_stubs.h \
>   $(srcdir)/src/admin/admin_client.h
> -$(srcdir)/daemon/remote_dispatch.h: $(srcdir)/src/remote/remote_protocol.x
> - $(MAKE) -C daemon remote_dispatch.h
> -$(srcdir)/daemon/qemu_dispatch.h: $(srcdir)/src/remote/qemu_protocol.x
> - $(MAKE) -C daemon qemu_dispatch.h
> +$(srcdir)/src/remote/lxc_client_bodies.h: $(srcdir)/src/remote/lxc_protocol.x
> + $(MAKE) -C src remote/lxc_client_bodies.h
> +$(srcdir)/src/remote/qemu_client_bodies.h: 
> $(srcdir)/src/remote/qemu_protocol.x
> + $(MAKE) -C src remote/qemu_client_bodies.h


These two are unrelated too



> diff --git i/src/Makefile.am w/src/Makefile.am
> index a1e5fa573..decdb9c3e 100644
> --- i/src/Makefile.am
> +++ w/src/Makefile.am
> @@ -544,14 +544,14 @@ remote/remote_daemon_dispatch_stubs.h: 
> $(top_srcdir)/src/rpc/gendispatch.pl \
> --mode=server remote REMOTE $(REMOTE_PROTOCOL) \
> > $(srcdir)/remote/remote_daemon_dispatch_stubs.h
>  
> -remote/remote_daemon_dispatch_lxc_stubs.h: 
> $(top_srcdir)/src/rpc/gendispatch.pl \
> - $(LXC_PROTOCOL) Makefile.am
> +remote/remote_daemon_dispatch_lxc_stubs.h: \
> + $(top_srcdir)/src/rpc/gendispatch.pl $(LXC_PROTOCOL) Makefile.am

Better is to replace  $(top_srcdir)/src  with $(srcdir)


Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|:

Re: [libvirt] [PATCH 03/10] src: simplify sysconfig file handling in make rules

2018-02-22 Thread Daniel P . Berrangé

On Thu, Feb 22, 2018 at 11:24:39AM +0100, Michal Privoznik wrote:
> On 02/21/2018 04:35 PM, Daniel P. Berrangé wrote:
> > Remove lots of duplication in the sysconfig file handling, so we can
> > add more conf files without modifying so many places.
> > 
> > Signed-off-by: Daniel P. Berrangé 
> > ---
> >  src/Makefile.am | 25 -
> >  1 file changed, 16 insertions(+), 9 deletions(-)
> > 
> > diff --git a/src/Makefile.am b/src/Makefile.am
> > index de2441dd6b..bb51be50d7 100644
> > --- a/src/Makefile.am
> > +++ b/src/Makefile.am
> > @@ -2683,23 +2683,30 @@ EXTRA_DIST += $(LOCK_DAEMON_SOURCES) \
> >   $(LOG_DAEMON_SOURCES)
> >  endif ! WITH_LIBVIRTD
> >  
> > -EXTRA_DIST += \
> > +SYSCONF_FILES = \
> > locking/virtlockd.sysconf \
> > +   logging/virtlogd.sysconf \
> > +   $(NULL)
> > +
> > +EXTRA_DIST += \
> > locking/lockd.conf \
> > locking/libvirt_lockd.aug \
> > -   locking/test_libvirt_lockd.aug.in \
> > -   logging/virtlogd.sysconf
> > +   locking/test_libvirt_lockd.aug.in
> 
> I guess you wanted to add $(SYSCONF_FILES) to EXTRA_DIST too.

Opps, yes.

Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] news: libxl now supports setting clock offset and adjustment

2018-02-22 Thread Michal Privoznik

On 02/21/2018 08:50 PM, Jim Fehlig wrote:
> Signed-off-by: Jim Fehlig 
> ---
>  docs/news.xml | 5 +
>  1 file changed, 5 insertions(+)
> 
> diff --git a/docs/news.xml b/docs/news.xml
> index b60cb2d98..86a0c8d18 100644
> --- a/docs/news.xml
> +++ b/docs/news.xml
> @@ -77,6 +77,11 @@
>conf: add support for setting Chassis SMBIOS data fields
>  
>
> +  
> +
> +  libxl: add support for setting clock offset and adjustment
> +
> +  
>  
>  
>  
> 

ACK

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 05/10] daemon: move libvirtd code into src/remote/ directory

2018-02-22 Thread Michal Privoznik

On 02/21/2018 04:35 PM, Daniel P. Berrangé wrote:
> Having a daemon/ directory makes little sense from a code structure
> point of view, as 90% of the code that is built into libvirtd already
> lives in the src/ directory. The virtlockd and virlogd daemons also live
> entirely in src/{locking,logging} directories. This moves the source
> code for libvirtd into src/remote/, alongside the client code.
> 
> Signed-off-by: Daniel P. Berrangé 
> ---
>  .gitignore |   2 +
>  daemon/Makefile.am | 125 
> +
>  src/Makefile.am|  93 ++-
>  daemon/libvirtd.c => src/remote/remote_daemon.c|  10 +-
>  daemon/libvirtd.h => src/remote/remote_daemon.h|  10 +-
>  .../remote/remote_daemon_config.c  |  10 +-
>  .../remote/remote_daemon_config.h  |  10 +-
>  .../remote/remote_daemon_dispatch.c|  16 +--
>  .../remote/remote_daemon_dispatch.h|  10 +-
>  .../stream.c => src/remote/remote_daemon_stream.c  |   8 +-
>  .../stream.h => src/remote/remote_daemon_stream.h  |  12 +-
>  11 files changed, 136 insertions(+), 170 deletions(-)
>  rename daemon/libvirtd.c => src/remote/remote_daemon.c (99%)
>  rename daemon/libvirtd.h => src/remote/remote_daemon.h (93%)
>  rename daemon/libvirtd-config.c => src/remote/remote_daemon_config.c (98%)
>  rename daemon/libvirtd-config.h => src/remote/remote_daemon_config.h (92%)
>  rename daemon/remote.c => src/remote/remote_daemon_dispatch.c (99%)
>  rename daemon/remote.h => src/remote/remote_daemon_dispatch.h (85%)
>  rename daemon/stream.c => src/remote/remote_daemon_stream.c (99%)>  rename 
> daemon/stream.h => src/remote/remote_daemon_stream.h (85%)

Not that simple. Instead of pointing out in the patch, here's the diff
you need to squash in:


diff --git i/cfg.mk w/cfg.mk
index 920b60917..3172822cf 100644
--- i/cfg.mk
+++ w/cfg.mk
@@ -32,7 +32,7 @@ gnulib_dir = $(srcdir)/.gnulib
 # List of additional files that we want to pick up in our POTFILES.in
 # This is all gnulib files, as well as generated files for RPC code.
 generated_files = \
-  $(srcdir)/daemon/{lxc,qemu,remote}_dispatch.h \
+  $(srcdir)/src/remote/remote_daemon_dispatch{_lxc,_qemu,_}_stubs.h \
   $(srcdir)/src/*/{admin_server,log_daemon,lock_daemon}_dispatch_stubs.h \
   $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \
   $(srcdir)/src/remote/*_client_bodies.h \
@@ -1116,17 +1116,26 @@ test-wrap-argv:
 
 # sc_po_check can fail if generated files are not built first
 sc_po_check: \
-   $(srcdir)/daemon/remote_dispatch.h \
-   $(srcdir)/daemon/qemu_dispatch.h \
+   $(srcdir)/src/remote/lxc_client_bodies.h \
+   $(srcdir)/src/remote/qemu_client_bodies.h \
$(srcdir)/src/remote/remote_client_bodies.h \
+   $(srcdir)/src/remote/remote_daemon_dispatch_lxc_stubs.h \
+   $(srcdir)/src/remote/remote_daemon_dispatch_qemu_stubs.h \
+   $(srcdir)/src/remote/remote_daemon_dispatch_stubs.h \
$(srcdir)/src/admin/admin_server_dispatch_stubs.h \
$(srcdir)/src/admin/admin_client.h
-$(srcdir)/daemon/remote_dispatch.h: $(srcdir)/src/remote/remote_protocol.x
-   $(MAKE) -C daemon remote_dispatch.h
-$(srcdir)/daemon/qemu_dispatch.h: $(srcdir)/src/remote/qemu_protocol.x
-   $(MAKE) -C daemon qemu_dispatch.h
+$(srcdir)/src/remote/lxc_client_bodies.h: $(srcdir)/src/remote/lxc_protocol.x
+   $(MAKE) -C src remote/lxc_client_bodies.h
+$(srcdir)/src/remote/qemu_client_bodies.h: $(srcdir)/src/remote/qemu_protocol.x
+   $(MAKE) -C src remote/qemu_client_bodies.h
 $(srcdir)/src/remote/remote_client_bodies.h: 
$(srcdir)/src/remote/remote_protocol.x
$(MAKE) -C src remote/remote_client_bodies.h
+$(srcdir)/src/remote/remote_daemon_dispatch_lxc_stubs.h: 
$(srcdir)/src/remote/lxc_protocol.x
+   $(MAKE) -C src remote/remote_daemon_dispatch_lxc_stubs.h
+$(srcdir)/src/remote/remote_daemon_dispatch_qemu_stubs.h: 
$(srcdir)/src/remote/qemu_protocol.x
+   $(MAKE) -C src remote/remote_daemon_dispatch_qemu_stubs.h
+$(srcdir)/src/remote/remote_daemon_dispatch_stubs.h: 
$(srcdir)/src/remote/remote_protocol.x
+   $(MAKE) -C src remote/remote_daemon_dispatch_stubs.h
 $(srcdir)/src/admin/admin_server_dispatch_stubs.h: 
$(srcdir)/src/admin/admin_protocol.x
$(MAKE) -C src admin/admin_server_dispatch_stubs.h
 $(srcdir)/src/admin/admin_client.h: $(srcdir)/src/admin/admin_protocol.x
@@ -1138,7 +1147,7 @@ exclude_file_name_regexp--sc_avoid_strcase = 
^tools/vsh\.h$$
 
_src1=libvirt-stream|qemu/qemu_monitor|util/vir(command|file|fdstream)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon|logging/log_daemon
 
_test1=shunloadtest|virnettlscontexttest|virnettlssessiontest|vircgroupmock|commandhelper
 exclude_file_name_regexp--sc_avoid_write = \
-

Re: [libvirt] [PATCH 04/10] daemon: remove obsolete doc describing daemon threading

2018-02-22 Thread Michal Privoznik

On 02/21/2018 04:35 PM, Daniel P. Berrangé wrote:
> The THREADS.txt describes the way threading worked in libvirtd many many
> years ago, long before even the RPC code was modularized. Things have
> evolved significantly since then, so delete this potentially misleading doc.
> 
> Signed-off-by: Daniel P. Berrangé 
> ---
>  daemon/THREADS.txt | 52 
>  1 file changed, 52 deletions(-)
>  delete mode 100644 daemon/THREADS.txt

You need to remove THREADS.txt from daemon/Makefile.am too:

diff --git i/daemon/Makefile.am w/daemon/Makefile.am
index 42d8f7b3f..658f6c312 100644
--- i/daemon/Makefile.am
+++ w/daemon/Makefile.am
@@ -80 +79,0 @@ EXTRA_DIST = \
-   THREADS.txt \

and from cfg.mk as well:

diff --git i/cfg.mk w/cfg.mk
index 920b60917..ebfe4a339 100644
--- i/cfg.mk
+++ w/cfg.mk
@@ -1262 +1262 @@ exclude_file_name_regexp--sc_prohibit_empty_first_line = \
-  
^(README|daemon/THREADS\.txt|src/esx/README|tests/(vmwarever|virhostcpu)data/.*)$$
+  ^(README|src/esx/README|tests/(vmwarever|virhostcpu)data/.*)$$


Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 07/10] daemon: move init system files into src/remote/

2018-02-22 Thread Michal Privoznik

On 02/21/2018 04:35 PM, Daniel P. Berrangé wrote:
> Move the systemd, sysvinit, upstart and sysconfig files into the
> src/remote/ directory.
> 
> Signed-off-by: Daniel P. Berrangé 
> ---
>  .gitignore |  1 +
>  daemon/Makefile.am | 94 
> +-
>  src/Makefile.am| 61 +-
>  {daemon => src/remote}/libvirtd.init.in|  0
>  {daemon => src/remote}/libvirtd.service.in |  0
>  {daemon => src/remote}/libvirtd.sysconf|  0
>  {daemon => src/remote}/libvirtd.upstart|  0
>  .../remote/virt-guest-shutdown.target.in   |  0
>  8 files changed, 62 insertions(+), 94 deletions(-)
>  rename {daemon => src/remote}/libvirtd.init.in (100%)
>  rename {daemon => src/remote}/libvirtd.service.in (100%)
>  rename {daemon => src/remote}/libvirtd.sysconf (100%)
>  rename {daemon => src/remote}/libvirtd.upstart (100%)
>  rename daemon/virt-guest-shutdown.target => 
> src/remote/virt-guest-shutdown.target.in (100%)

You need to break the long line:

diff --git i/src/Makefile.am w/src/Makefile.am
index 93da2421b..84cba6656 100644
--- i/src/Makefile.am
+++ w/src/Makefile.am
@@ -2978 +2978,2 @@ libvirtd.service: remote/libvirtd.service.in 
$(top_builddir)/config.status
-virt-guest-shutdown.target: remote/virt-guest-shutdown.target.in 
$(top_builddir)/config.status
+virt-guest-shutdown.target: \
+   remote/virt-guest-shutdown.target.in $(top_builddir)/config.status


Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 09/10] daemon: move misc libvirtd policy files to src/remote/

2018-02-22 Thread Michal Privoznik

On 02/21/2018 04:35 PM, Daniel P. Berrangé wrote:
> Signed-off-by: Daniel P. Berrangé 
> ---
>  daemon/Makefile.am| 87 ++---
>  src/Makefile.am   | 92 
> ++-
>  {daemon => src/remote}/libvirtd.policy.in |  0
>  daemon/libvirt.rules => src/remote/libvirtd.rules |  0
>  {daemon => src/remote}/libvirtd.sasl  |  0
>  {daemon => src/remote}/libvirtd.sysctl|  0
>  6 files changed, 94 insertions(+), 85 deletions(-)
>  rename {daemon => src/remote}/libvirtd.policy.in (100%)
>  rename daemon/libvirt.rules => src/remote/libvirtd.rules (100%)
>  rename {daemon => src/remote}/libvirtd.sasl (100%)
>  rename {daemon => src/remote}/libvirtd.sysctl (100%)

diff --git i/src/Makefile.am w/src/Makefile.am
index 457ef370a..7cea97fbd 100644
--- i/src/Makefile.am
+++ w/src/Makefile.am
@@ -2878 +2878,2 @@ if ! WITH_POLKIT0
-   $(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules 
$(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules
+   $(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \
+   $(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules
@@ -3530 +3531,2 @@ endif WITH_NSS
-install-data-local: install-init install-systemd install-upstart 
install-sysctl install-polkit install-sasl
+install-data-local: install-init install-systemd install-upstart \
+   install-sysctl install-polkit install-sasl
@@ -3585 +3587,2 @@ endif WITH_NETWORK
-uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart 
uninstall-sysctl uninstall-polkit uninstall-sasl
+uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \
+   uninstall-sysctl uninstall-polkit uninstall-sasl


Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 00/10] Move the libvirtd daemon into src/remote/

2018-02-22 Thread Michal Privoznik

On 02/21/2018 04:35 PM, Daniel P. Berrangé wrote:
> Having a daemon/ directory makes little sense from a code structure
> point of view, as 90% of the code that is built into libvirtd already
> lives in the src/ directory. The virtlockd and virlogd daemons also live
> entirely in src/{locking,logging} directories. This series thus moves it
> all into the src/remote/ directory. This will make even more sense when
> we introduce further modular daemons for various drivers.
> 
> Daniel P. Berrangé (10):
>   src: simplify systemd unit file handling in make rules
>   src: simplify sysv init file handling in make rules
>   src: simplify sysconfig file handling in make rules
>   daemon: remove obsolete doc describing daemon threading
>   daemon: move libvirtd code into src/remote/ directory
>   daemon: move libvirtd POD manpage into src/remote/
>   daemon: move init system files into src/remote/
>   daemon: move configuration files to src/remote
>   daemon: move misc libvirtd policy files to src/remote/
>   daemon: move logrotate files to src/remote/
> 
>  .gitignore |   3 +
>  Makefile.am|   2 +-
>  configure.ac   |   1 -
>  daemon/Makefile.am | 465 
> -
>  daemon/THREADS.txt |  52 ---
>  src/Makefile.am| 420 ---
>  {daemon => src/remote}/libvirtd.aug|   0
>  {daemon => src/remote}/libvirtd.conf   |   0
>  {daemon => src/remote}/libvirtd.init.in|   0
>  {daemon => src/remote}/libvirtd.libxl.logrotate.in |   0
>  {daemon => src/remote}/libvirtd.logrotate.in   |   0
>  {daemon => src/remote}/libvirtd.lxc.logrotate.in   |   0
>  {daemon => src/remote}/libvirtd.pod|   0
>  {daemon => src/remote}/libvirtd.policy.in  |   0
>  {daemon => src/remote}/libvirtd.qemu.logrotate.in  |   0
>  daemon/libvirt.rules => src/remote/libvirtd.rules  |   0
>  {daemon => src/remote}/libvirtd.sasl   |   0
>  {daemon => src/remote}/libvirtd.service.in |   0
>  {daemon => src/remote}/libvirtd.sysconf|   0
>  {daemon => src/remote}/libvirtd.sysctl |   0
>  {daemon => src/remote}/libvirtd.uml.logrotate.in   |   0
>  {daemon => src/remote}/libvirtd.upstart|   0
>  daemon/libvirtd.c => src/remote/remote_daemon.c|  10 +-
>  daemon/libvirtd.h => src/remote/remote_daemon.h|  10 +-
>  .../remote/remote_daemon_config.c  |  10 +-
>  .../remote/remote_daemon_config.h  |  10 +-
>  .../remote/remote_daemon_dispatch.c|  16 +-
>  .../remote/remote_daemon_dispatch.h|  10 +-
>  .../stream.c => src/remote/remote_daemon_stream.c  |   8 +-
>  .../stream.h => src/remote/remote_daemon_stream.h  |  12 +-
>  {daemon => src/remote}/test_libvirtd.aug.in|   0
>  .../remote/virt-guest-shutdown.target.in   |   0
>  32 files changed, 410 insertions(+), 619 deletions(-)
>  delete mode 100644 daemon/Makefile.am
>  delete mode 100644 daemon/THREADS.txt
>  rename {daemon => src/remote}/libvirtd.aug (100%)
>  rename {daemon => src/remote}/libvirtd.conf (100%)
>  rename {daemon => src/remote}/libvirtd.init.in (100%)
>  rename {daemon => src/remote}/libvirtd.libxl.logrotate.in (100%)
>  rename {daemon => src/remote}/libvirtd.logrotate.in (100%)
>  rename {daemon => src/remote}/libvirtd.lxc.logrotate.in (100%)
>  rename {daemon => src/remote}/libvirtd.pod (100%)
>  rename {daemon => src/remote}/libvirtd.policy.in (100%)
>  rename {daemon => src/remote}/libvirtd.qemu.logrotate.in (100%)
>  rename daemon/libvirt.rules => src/remote/libvirtd.rules (100%)
>  rename {daemon => src/remote}/libvirtd.sasl (100%)
>  rename {daemon => src/remote}/libvirtd.service.in (100%)
>  rename {daemon => src/remote}/libvirtd.sysconf (100%)
>  rename {daemon => src/remote}/libvirtd.sysctl (100%)
>  rename {daemon => src/remote}/libvirtd.uml.logrotate.in (100%)
>  rename {daemon => src/remote}/libvirtd.upstart (100%)
>  rename daemon/libvirtd.c => src/remote/remote_daemon.c (99%)
>  rename daemon/libvirtd.h => src/remote/remote_daemon.h (93%)
>  rename daemon/libvirtd-config.c => src/remote/remote_daemon_config.c (98%)
>  rename daemon/libvirtd-config.h => src/remote/remote_daemon_config.h (92%)
>  rename daemon/remote.c => src/remote/remote_daemon_dispatch.c (99%)
>  rename daemon/remote.h => src/remote/remote_daemon_dispatch.h (85%)
>  rename daemon/stream.c => src/remote/remote_daemon_stream.c (99%)
>  rename daemon/stream.h => src/remote/remote_daemon_stream.h (85%)
>  rename {daemon => src/remote}/test_libvirtd.aug.in (100%)
>  rename daemon/virt-guest-shutdown.target => 
> src/remote/virt-guest-shutdown.target.in (100%)
> 

ACK series, but see my comments to patches before pushing.

Michal

--
libvir-list mailing list

Re: [libvirt] [PATCH 08/10] daemon: move configuration files to src/remote

2018-02-22 Thread Michal Privoznik

On 02/21/2018 04:35 PM, Daniel P. Berrangé wrote:
> Signed-off-by: Daniel P. Berrangé 
> ---
>  daemon/Makefile.am  | 26 --
>  src/Makefile.am | 24 +++-
>  {daemon => src/remote}/libvirtd.aug |  0
>  {daemon => src/remote}/libvirtd.conf|  0
>  {daemon => src/remote}/test_libvirtd.aug.in |  0
>  5 files changed, 23 insertions(+), 27 deletions(-)
>  rename {daemon => src/remote}/libvirtd.aug (100%)
>  rename {daemon => src/remote}/libvirtd.conf (100%)
>  rename {daemon => src/remote}/test_libvirtd.aug.in (100%)

diff --git i/src/Makefile.am w/src/Makefile.am
index 74aa847a4..042cec8b3 100644
--- i/src/Makefile.am
+++ w/src/Makefile.am
@@ -1422 +1422,2 @@ endif WITH_LIBVIRTD
-EXTRA_DIST += remote/test_libvirtd.aug.in remote/libvirtd.aug 
remote/libvirtd.conf
+EXTRA_DIST += remote/test_libvirtd.aug.in remote/libvirtd.aug \
+ remote/libvirtd.conf


Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 03/10] src: simplify sysconfig file handling in make rules

2018-02-22 Thread Michal Privoznik

On 02/21/2018 04:35 PM, Daniel P. Berrangé wrote:
> Remove lots of duplication in the sysconfig file handling, so we can
> add more conf files without modifying so many places.
> 
> Signed-off-by: Daniel P. Berrangé 
> ---
>  src/Makefile.am | 25 -
>  1 file changed, 16 insertions(+), 9 deletions(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index de2441dd6b..bb51be50d7 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -2683,23 +2683,30 @@ EXTRA_DIST += $(LOCK_DAEMON_SOURCES) \
> $(LOG_DAEMON_SOURCES)
>  endif ! WITH_LIBVIRTD
>  
> -EXTRA_DIST += \
> +SYSCONF_FILES = \
>   locking/virtlockd.sysconf \
> + logging/virtlogd.sysconf \
> + $(NULL)
> +
> +EXTRA_DIST += \
>   locking/lockd.conf \
>   locking/libvirt_lockd.aug \
> - locking/test_libvirt_lockd.aug.in \
> - logging/virtlogd.sysconf
> + locking/test_libvirt_lockd.aug.in

I guess you wanted to add $(SYSCONF_FILES) to EXTRA_DIST too.

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 10/10] daemon: move logrotate files to src/remote/

2018-02-22 Thread Michal Privoznik

On 02/21/2018 04:35 PM, Daniel P. Berrangé wrote:
> Signed-off-by: Daniel P. Berrangé 
> ---
>  Makefile.am|   2 +-
>  configure.ac   |   1 -
>  daemon/Makefile.am | 117 
> -
>  src/Makefile.am|  45 +++-
>  {daemon => src/remote}/libvirtd.libxl.logrotate.in |   0
>  {daemon => src/remote}/libvirtd.logrotate.in   |   0
>  {daemon => src/remote}/libvirtd.lxc.logrotate.in   |   0
>  {daemon => src/remote}/libvirtd.qemu.logrotate.in  |   0
>  {daemon => src/remote}/libvirtd.uml.logrotate.in   |   0
>  9 files changed, 44 insertions(+), 121 deletions(-)
>  delete mode 100644 daemon/Makefile.am
>  rename {daemon => src/remote}/libvirtd.libxl.logrotate.in (100%)
>  rename {daemon => src/remote}/libvirtd.logrotate.in (100%)
>  rename {daemon => src/remote}/libvirtd.lxc.logrotate.in (100%)
>  rename {daemon => src/remote}/libvirtd.qemu.logrotate.in (100%)
>  rename {daemon => src/remote}/libvirtd.uml.logrotate.in (100%)

diff --git i/.gitignore w/.gitignore
index 7ff6cec2f..e9036fa39 100644
--- i/.gitignore
+++ w/.gitignore
@@ -65,2 +64,0 @@
-/daemon/libvirtd*.logrotate
-/daemon/libvirtd.policy
@@ -142,0 +141,2 @@
+/src/libvirtd*.logrotate
+/src/libvirtd.policy


Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH] bhyve: add missing cases for graphics listen type

2018-02-22 Thread Daniel P . Berrangé

Address warning from -Wswitch-enum by adding missing cases
for graphics listen types that are not supported.

Signed-off-by: Daniel P. Berrangé 
---

Pushed as a CI build fix

 src/bhyve/bhyve_command.c | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index fd738b42c..5e309c3a2 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -419,9 +419,15 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def,
 
 virBufferAsprintf(, ":%d", graphics->data.vnc.port);
 break;
-default:
+case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET:
+case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Unsupported listen type"));
+goto error;
+case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST:
+default:
+virReportEnumRangeError(virDomainGraphicsListenType, glisten->type);
+goto error;
 }
 
 if (video->driver)
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] src: remove WITH_LIBVIRTD condition around hal/udev build

2018-02-22 Thread Daniel P . Berrangé

On Thu, Feb 22, 2018 at 08:15:26AM +0100, Michal Privoznik wrote:
> On 02/21/2018 04:22 PM, Daniel P. Berrangé wrote:
> > Currently building --without-libvirtd causes a failure to link the node
> > device driver:
> > 
> > node_device/.libs/libvirt_driver_nodedev_la-node_device_driver.o: In 
> > function `nodedevRegister':
> > /home/berrange/src/virt/libvirt/src/node_device/node_device_driver.c:649: 
> > undefined reference to `udevNodeRegister'
> > collect2: error: ld returned 1 exit status
> > 
> > because it causes us to build the core nodedev driver, but then skip the
> > implementations, despite udev being available.
> > 
> > Signed-off-by: Daniel P. Berrangé 
> > ---
> >  src/Makefile.am | 2 --
> >  1 file changed, 2 deletions(-)
> 
> ACK, although you already pushed this. You could use both rules for
> pushing patches without review - this patch fixes broken build and is
> trivial. Speaking of which, do we document the rules somewhere? I don't
> think we do.

Opps, yes, I actually pushed this without realizing I had left it in
master !  I don't think we have ever documented the trivial/build breaker
fix guidelines explicitly.  I just tend to explain them to people when I
granted them commit access.

Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH v2 0/6] port allocator: make used port bitmap global etc

2018-02-22 Thread Nikolay Shirokovskiy

ping

On 06.02.2018 12:09, Nikolay Shirokovskiy wrote:
> This patch set addresses issue(s) described in [1] and the core of
> changes go to the first patch. The others are cleanups and
> refactorings.
> 
> Diff from v1:
> - rename virPortRange to virPortAllocatorRange (virPortRange is occupied)
> - release ports in libxl and bhyve tests 
> - overload bind syscall for libxl and bhyve tests
> - fix undefined behaviour on port release on error paths in qemu test
> 
> WARNING! I did not compile with bhyve.
> 
> [1] https://www.redhat.com/archives/libvir-list/2017-December/msg00600.html
> 
> Nikolay Shirokovskiy (6):
>   port allocator: make used port bitmap global
>   port allocator: remove range on manual port reserving
>   port allocator: remove range check in release function
>   port allocator: drop skip bind check flag
>   port allocator: remove release functionality from set used
>   port allocator: make port range constant object
> 
>  src/bhyve/bhyve_command.c  |   4 +-
>  src/bhyve/bhyve_driver.c   |   5 +-
>  src/bhyve/bhyve_process.c  |   7 +-
>  src/bhyve/bhyve_utils.h|   2 +-
>  src/libvirt_private.syms   |   3 +-
>  src/libxl/libxl_conf.c |   8 +-
>  src/libxl/libxl_conf.h |  12 +--
>  src/libxl/libxl_domain.c   |   3 +-
>  src/libxl/libxl_driver.c   |  17 ++---
>  src/libxl/libxl_migration.c|   4 +-
>  src/qemu/qemu_conf.h   |  12 +--
>  src/qemu/qemu_driver.c |  27 +++
>  src/qemu/qemu_migration.c  |  12 +--
>  src/qemu/qemu_process.c|  55 --
>  src/util/virportallocator.c| 166 
> -
>  src/util/virportallocator.h|  25 +++
>  tests/bhyvexml2argvmock.c  |   7 ++
>  tests/bhyvexml2argvtest.c  |  10 ++-
>  tests/libxlxml2domconfigtest.c |  12 ++-
>  tests/virmocklibxl.c   |   7 ++
>  tests/virportallocatortest.c   |  53 +++--
>  21 files changed, 237 insertions(+), 214 deletions(-)
> 

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

59 matches

Mail list logo