[libvirt] [PATCH] conf: Skip MAC checks when using an auto-generated one during detach-device
by Kothapally Madhu Pavan
When we try to detach a network device without specifying the
mac address, random mac address is generated. As the generated
mac address will not be available in the running vm, detaching
device will fail erroring out "error: operation failed: no
device matching mac address xx:xx:xx:xx:xx:xx found".
This patch allows to match DetachDeviec xml using PCI address
when mac address is not specified.
Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com>
---
src/conf/domain_conf.c | 116 +++++++++++++++++++++++++++++-----------------
src/conf/domain_conf.h | 6 ++
src/libxl/libxl_driver.c | 4 +-
src/lxc/lxc_driver.c | 6 +-
src/qemu/qemu_driver.c | 40 ++++++++++++++--
src/qemu/qemu_hotplug.c | 16 ++++--
src/qemu/qemu_hotplug.h | 3 +
7 files changed, 132 insertions(+), 59 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 568c699..f07f178 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13613,14 +13613,20 @@ int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net)
return 0;
}
-/* virDomainNetFindIdx: search according to mac address and guest side
- * PCI address (if specified)
+/* virDomainNetFindIdx:
+ * search according to mac address and guest side PCI address (if specified).
+ *
+ * @def: pointer to domain definition
+ * @net: pointer to network definition that has to be looked up for
+ * @MACAddrNotSpecified: when detaching a device it takes "true" when mac address is
+ * not specified in device xml and a random mac is generated which
+ * cannot be found in the domain def.
*
* Return: index of match if unique match found
* -1 otherwise and an error is logged
*/
int
-virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net)
+virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net, bool MACAddrNotSpecified)
{
size_t i;
int matchidx = -1;
@@ -13628,50 +13634,76 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net)
bool PCIAddrSpecified = virDomainDeviceAddressIsValid(&net->info,
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI);
- for (i = 0; i < def->nnets; i++) {
- if (virMacAddrCmp(&def->nets[i]->mac, &net->mac))
- continue;
-
- if ((matchidx >= 0) && !PCIAddrSpecified) {
- /* there were multiple matches on mac address, and no
- * qualifying guest-side PCI address was given, so we must
- * fail (NB: a USB address isn't adequate, since it may
- * specify only vendor and product ID, and there may be
- * multiples of those.
- */
- virReportError(VIR_ERR_OPERATION_FAILED,
- _("multiple devices matching mac address %s found"),
- virMacAddrFormat(&net->mac, mac));
- return -1;
- }
+ /* MAC address is not specified in device xml. So, we need not check for it.
+ * Here we check for matching PCI address if specified. */
+ if (MACAddrNotSpecified) {
if (PCIAddrSpecified) {
- if (virPCIDeviceAddressEqual(&def->nets[i]->info.addr.pci,
- &net->info.addr.pci)) {
- /* exit early if the pci address was specified and
- * it matches, as this guarantees no duplicates.
+ for (i = 0; i < def->nnets; i++) {
+ if (virPCIDeviceAddressEqual(&def->nets[i]->info.addr.pci,
+ &net->info.addr.pci)) {
+ matchidx = i;
+ break;
+ }
+ }
+ if (matchidx < 0) {
+ virReportError(VIR_ERR_OPERATION_FAILED,
+ _("no device found on "
+ "%.4x:%.2x:%.2x.%.1x"),
+ net->info.addr.pci.domain,
+ net->info.addr.pci.bus,
+ net->info.addr.pci.slot,
+ net->info.addr.pci.function);
+ }
+ } else {
+ virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+ _("mac address and pci address not specified in device xml"));
+ }
+ } else {
+ for (i = 0; i < def->nnets; i++) {
+ if (virMacAddrCmp(&def->nets[i]->mac, &net->mac))
+ continue;
+
+ if ((matchidx >= 0) && !PCIAddrSpecified) {
+ /* there were multiple matches on mac address, and no
+ * qualifying guest-side PCI address was given, so we must
+ * fail (NB: a USB address isn't adequate, since it may
+ * specify only vendor and product ID, and there may be
+ * multiples of those.
*/
+ virReportError(VIR_ERR_OPERATION_FAILED,
+ _("multiple devices matching mac address %s found"),
+ virMacAddrFormat(&net->mac, mac));
+ return -1;
+ }
+ if (PCIAddrSpecified) {
+ if (virPCIDeviceAddressEqual(&def->nets[i]->info.addr.pci,
+ &net->info.addr.pci)) {
+ /* exit early if the pci address was specified and
+ * it matches, as this guarantees no duplicates.
+ */
+ matchidx = i;
+ break;
+ }
+ } else {
+ /* no PCI address given, so there may be multiple matches */
matchidx = i;
- break;
}
- } else {
- /* no PCI address given, so there may be multiple matches */
- matchidx = i;
}
- }
- if (matchidx < 0) {
- if (PCIAddrSpecified) {
- virReportError(VIR_ERR_OPERATION_FAILED,
- _("no device matching mac address %s found on "
- "%.4x:%.2x:%.2x.%.1x"),
- virMacAddrFormat(&net->mac, mac),
- net->info.addr.pci.domain,
- net->info.addr.pci.bus,
- net->info.addr.pci.slot,
- net->info.addr.pci.function);
- } else {
- virReportError(VIR_ERR_OPERATION_FAILED,
- _("no device matching mac address %s found"),
- virMacAddrFormat(&net->mac, mac));
+ if (matchidx < 0) {
+ if (PCIAddrSpecified) {
+ virReportError(VIR_ERR_OPERATION_FAILED,
+ _("no device matching mac address %s found on "
+ "%.4x:%.2x:%.2x.%.1x"),
+ virMacAddrFormat(&net->mac, mac),
+ net->info.addr.pci.domain,
+ net->info.addr.pci.bus,
+ net->info.addr.pci.slot,
+ net->info.addr.pci.function);
+ } else {
+ virReportError(VIR_ERR_OPERATION_FAILED,
+ _("no device matching mac address %s found"),
+ virMacAddrFormat(&net->mac, mac));
+ }
}
}
return matchidx;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index b1953b3..d3ebcdc 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2581,6 +2581,8 @@ typedef enum {
VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS = 1 << 8,
/* allow updates in post parse callback that would break ABI otherwise */
VIR_DOMAIN_DEF_PARSE_ABI_UPDATE = 1 << 9,
+ /* indicates mac address is generated when not provided in device xml */
+ VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR = 1 << 10,
} virDomainDefParseFlags;
typedef enum {
@@ -2710,7 +2712,9 @@ int virDomainDiskSourceParse(xmlNodePtr node,
xmlXPathContextPtr ctxt,
virStorageSourcePtr src);
-int virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net);
+int virDomainNetFindIdx(virDomainDefPtr def,
+ virDomainNetDefPtr net,
+ bool MACAddrNotSpecified);
virDomainNetDefPtr virDomainNetFind(virDomainDefPtr def, const char *device);
bool virDomainHasNet(virDomainDefPtr def, virDomainNetDefPtr net);
int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net);
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 95dfc01..1c53c5f 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3422,7 +3422,7 @@ libxlDomainDetachNetDevice(libxlDriverPrivatePtr driver,
libxl_device_nic_init(&nic);
- if ((detachidx = virDomainNetFindIdx(vm->def, net)) < 0)
+ if ((detachidx = virDomainNetFindIdx(vm->def, net, false)) < 0)
goto cleanup;
detach = vm->def->nets[detachidx];
@@ -3521,7 +3521,7 @@ libxlDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev)
case VIR_DOMAIN_DEVICE_NET:
net = dev->data.net;
- if ((idx = virDomainNetFindIdx(vmdef, net)) < 0)
+ if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0)
return -1;
/* this is guaranteed to succeed */
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 67f14fe..3d1396a 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -3929,7 +3929,7 @@ lxcDomainUpdateDeviceConfig(virDomainDefPtr vmdef,
switch (dev->type) {
case VIR_DOMAIN_DEVICE_NET:
net = dev->data.net;
- if ((idx = virDomainNetFindIdx(vmdef, net)) < 0)
+ if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0)
goto cleanup;
virDomainNetDefFree(vmdef->nets[idx]);
@@ -3975,7 +3975,7 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef,
case VIR_DOMAIN_DEVICE_NET:
net = dev->data.net;
- if ((idx = virDomainNetFindIdx(vmdef, net)) < 0)
+ if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0)
goto cleanup;
/* this is guaranteed to succeed */
@@ -4759,7 +4759,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm,
virDomainNetDefPtr detach = NULL;
virNetDevVPortProfilePtr vport = NULL;
- if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0)
+ if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net, false)) < 0)
goto cleanup;
detach = vm->def->nets[detachidx];
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 10d3e3d..e6c811c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4105,6 +4105,31 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver,
virObjectUnref(cfg);
}
+static bool qemuIsMacAvailable(const char *xmlStr)
+{
+ xmlNodePtr cur;
+ xmlXPathContextPtr ctxt = NULL;
+
+ if (!virXMLParseStringCtxt(xmlStr, _("(device_definition)"), &ctxt))
+ goto endjob;
+
+ cur = ctxt->node->children;
+ while (cur != NULL) {
+ if (cur->type == XML_ELEMENT_NODE) {
+ if (xmlStrEqual(cur->name, BAD_CAST "mac"))
+ goto cleanup;
+ }
+ cur = cur->next;
+ }
+
+ endjob:
+ xmlXPathFreeContext(ctxt);
+ return false;
+
+ cleanup:
+ xmlXPathFreeContext(ctxt);
+ return true;
+}
static void
syncNicRxFilterMacAddr(char *ifname, virNetDevRxFilterPtr guestFilter,
@@ -7587,7 +7612,8 @@ qemuDomainDetachDeviceControllerLive(virQEMUDriverPtr driver,
static int
qemuDomainDetachDeviceLive(virDomainObjPtr vm,
virDomainDeviceDefPtr dev,
- virDomainPtr dom)
+ virDomainPtr dom,
+ unsigned int parse_flags)
{
virQEMUDriverPtr driver = dom->conn->privateData;
int ret = -1;
@@ -7603,7 +7629,7 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm,
ret = qemuDomainDetachLease(driver, vm, dev->data.lease);
break;
case VIR_DOMAIN_DEVICE_NET:
- ret = qemuDomainDetachNetDevice(driver, vm, dev);
+ ret = qemuDomainDetachNetDevice(driver, vm, dev, parse_flags);
break;
case VIR_DOMAIN_DEVICE_HOSTDEV:
ret = qemuDomainDetachHostDevice(driver, vm, dev);
@@ -7932,6 +7958,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
virDomainChrDefPtr chr;
virDomainFSDefPtr fs;
int idx;
+ bool skipMac = parse_flags & VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR ? true : false;
switch ((virDomainDeviceType) dev->type) {
case VIR_DOMAIN_DEVICE_DISK:
@@ -7946,7 +7973,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
case VIR_DOMAIN_DEVICE_NET:
net = dev->data.net;
- if ((idx = virDomainNetFindIdx(vmdef, net)) < 0)
+ if ((idx = virDomainNetFindIdx(vmdef, net, skipMac)) < 0)
return -1;
/* this is guaranteed to succeed */
@@ -8115,7 +8142,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef,
case VIR_DOMAIN_DEVICE_NET:
net = dev->data.net;
- if ((pos = virDomainNetFindIdx(vmdef, net)) < 0)
+ if ((pos = virDomainNetFindIdx(vmdef, net, false)) < 0)
return -1;
virDomainNetDefFree(vmdef->nets[pos]);
@@ -8452,6 +8479,9 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom,
!(flags & VIR_DOMAIN_AFFECT_LIVE))
parse_flags |= VIR_DOMAIN_DEF_PARSE_INACTIVE;
+ if (!qemuIsMacAvailable(xml))
+ parse_flags |= VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR;
+
dev = dev_copy = virDomainDeviceDefParse(xml, vm->def,
caps, driver->xmlopt,
parse_flags);
@@ -8495,7 +8525,7 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom,
VIR_DOMAIN_DEVICE_ACTION_DETACH) < 0)
goto endjob;
- if ((ret = qemuDomainDetachDeviceLive(vm, dev_copy, dom)) < 0)
+ if ((ret = qemuDomainDetachDeviceLive(vm, dev_copy, dom, parse_flags)) < 0)
goto endjob;
/*
* update domain status forcibly because the domain status may be
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 6ce0a84..2bf82b4 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2163,7 +2163,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
int ret = -1;
int changeidx = -1;
- if ((changeidx = virDomainNetFindIdx(vm->def, newdev)) < 0)
+ if ((changeidx = virDomainNetFindIdx(vm->def, newdev, false)) < 0)
goto cleanup;
devslot = &vm->def->nets[changeidx];
@@ -3825,7 +3825,7 @@ int qemuDomainDetachHostDevice(virQEMUDriverPtr driver,
* function so that mac address / virtualport are reset
*/
if (detach->parent.type == VIR_DOMAIN_DEVICE_NET)
- return qemuDomainDetachNetDevice(driver, vm, &detach->parent);
+ return qemuDomainDetachNetDevice(driver, vm, &detach->parent, 0);
else
return qemuDomainDetachThisHostDevice(driver, vm, detach);
}
@@ -3833,14 +3833,20 @@ int qemuDomainDetachHostDevice(virQEMUDriverPtr driver,
int
qemuDomainDetachNetDevice(virQEMUDriverPtr driver,
virDomainObjPtr vm,
- virDomainDeviceDefPtr dev)
+ virDomainDeviceDefPtr dev,
+ unsigned int parse_flags)
{
int detachidx, ret = -1;
virDomainNetDefPtr detach = NULL;
qemuDomainObjPrivatePtr priv = vm->privateData;
- if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0)
- goto cleanup;
+ if (parse_flags & VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR) {
+ if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net, true)) < 0)
+ goto cleanup;
+ } else {
+ if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net, false)) < 0)
+ goto cleanup;
+ }
detach = vm->def->nets[detachidx];
diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index 165d345..f144879 100644
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -82,7 +82,8 @@ int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver,
virDomainDeviceDefPtr dev);
int qemuDomainDetachNetDevice(virQEMUDriverPtr driver,
virDomainObjPtr vm,
- virDomainDeviceDefPtr dev);
+ virDomainDeviceDefPtr dev,
+ unsigned int parse_flags);
int qemuDomainDetachHostDevice(virQEMUDriverPtr driver,
virDomainObjPtr vm,
virDomainDeviceDefPtr dev);
9 years
[libvirt] [PATCH 0/3] Couple of build fixes
by Michal Privoznik
I've noticed couple of build failures with a bleeding edge gcc.
Here are fixes to some of them.
Michal Privoznik (3):
docs: Teach apibuild to deal with (1U << 31) too
Turn 1<<31 into 1U<<31
build: use gnulib's unsetenv
bootstrap.conf | 1 +
docs/apibuild.py | 3 ++-
include/libvirt/libvirt-domain.h | 2 +-
src/util/virtypedparam.h | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
--
2.8.3
9 years
[libvirt] [PATCH rfc 0/1] storage: vzstorage storage pool
by Olga Krishtal
In-Reply-To:
This is first draft, that supports vzstorage in storage pools.i
Virtuozzo Storage is a fault-tolerant distributed storage system, optimized
for virtualization workloads.
Vzstorage pool supports the same volume formats as directory, nfs, etc.
In terms of volume management - there is no difference between these pools.
You can find more information here: https://openvz.org/Virtuozzo_Storage
XML:
<pool type='vz'>
<name>vz7_pool</name>
<uuid>b27a72b5-a92e-4e58-a172-a80ba73b30fe</uuid>
<capacity unit='bytes'>0</capacity>
<allocation unit='bytes'>0</allocation>
<available unit='bytes'>0</available>
<source>
<host name='127.0.0.2'/>
<device path='vz7-vzstorage'/>
<dir path='/pool1'/>
</source>
<target>
<path>/vz7-vzstorage</path>
</target>
</pool>
To compile libvirt with vz pool support use key --with-storage-vz
I need some help to resolve some problems:
- how to detect that pool is alredy mounted.
- when we show pool sources do we need to show folders that may reside on vzstorage
- I am not quite sure that we need host name in xml.
I will be glad to here your opinion.
9 years
[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake
Pulls in several portability fixes, including the fact that gnulib
now only works on platforms with two's complement signed integers.
Also makes for a smaller delta on the next update (we are waiting
on a license change to unsetenv for the sake of mingw).
* .gnulib: Update to latest.
* bootstrap: Resync from upstream.
* tests/virstringtest.c: Drop use of obsolete probes of integer
properties.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
I'd like to get this in now, before RC1 is cut, so that we maximize
the testing of the bulk of the gnulib changes (rather than waiting
for the unsetenv change needed for mingw to land, but forcing the
gnulib update to only get testing in RC2).
* .gnulib 6cc32c6...8d807a9 (127):
> gendocs.sh: Set default TOP_NODE_UP_URL in HTML output.
> manywarnings: update for GCC 6.1
> autoupdate
> intdiv0, memmem, nocrash, strcasestr, strstr: no exit
> glob: size_t overflow checks
> glob: don't assume INT_MAX < SIZE_MAX
> Fix undefined behaviour in gettext.h.
> autoupdate
> git-version-gen: avoid undefined shift
> update from texinfo
> glob: merge glibc changes into lib/glob.c
> mktime: spelling fix in comment
> mktime: port to stricter signed overflow checking
> mktime: speed up DEBUG_MKTIME benchmarks
> mktime: resurrect DEBUG_MKTIME testing
> mktime: simplify DEBUG_MKTIME
> Port mktime_internal offset to unsigned time_t
> xstrtol: prohibit monstrosities like "1bB"
> xstrtod: reinstate setting of *result upon ERANGE
> xstrtod: modify *result only if no errors
> btowc: document problems in C locale
> autoupdate
> update from texinfo
> mktime: improve integer overflow checking
> intprops: check two's complement assumption
> intprops, mktime, strtol: assume two's complement
> stdint: port to strict C11 left shift
> mbrtowc: work around glibc bug#19932
> update from texinfo
> autoupdate
> stdint: detect good enough pre-C++11 stdint.h in C++ mode
> argp: merge changes from glibc
> Prefer American spelling for "initialize"
> autoupdate
> stddef: support configuring with g++
> autoupdate
> autoupdate
> update from texinfo
> test-framework-sh: minor cleanups
> test-framework-sh: revert port to NetBSD 7.0
> autoupdate
> Port better to Alpine Linux
> test-framework-sh: port to NetBSD 7.0
> update from texinfo
> gitlog-to-changelog: suppress ignored chatter
> update from texinfo
> update from texinfo
> setlocale: add "sv" to Windows language table
> update from texinfo
> sys_select: port to new Cygwin
> test-userspec.c: do not trigger gcc's new -Wmisleading-indentation
> time_rz: port to clang -Wunused-const-variable
> std-gnu11: improve clang support
> select: port more to Intel 2016.1.150 compiler
> select: try to port to 2016.1.150 compiler
> localename-tests: memory allocation fixes
> intprops: make .h file license match module
> acl: fix missing return on Cygwin
> update from texinfo
> update from texinfo
> extern-inline: port to PGI CC
> update from texinfo
> update from texinfo
> signbit: port back to pre-C++11 GCC
> mountlist: recognize autofs-mounted remote file systems, too
> signbit: port to C++ with GCC 6
> regex: make it closer to libc
> regex: merge patches from libc
> update from texinfo
> update from texinfo
> autoupdate
> autoupdate
> stdalign: port to older HP and IBM cc
> stdalign: port to clang 3.7.0
> update from texinfo
> readdir_r: now obsolescent
> Use modern texinfo when syncing install.texi output from autoconf
> update from texinfo
> sync install.texi from autoconf
> misc: port better to gcc -fsanitize=address
> update from texinfo
> autoupdate
> verify-tests: also remove stray test-verify.Tpo
> std-gnu11: new module
> update from texinfo
> update from texinfo
> get-permissions, strftime: fix grammar in comments
> gettext: mark as obsolete
> gnulib-tool: don't give up on ln -s so easily
> closedir: fix OS/2-related typos
> openat_proc_name: fix that last '/' is overwritten on OS/2 kLIBC
> regex: treat [x] as x if x is a unibyte encoding error
> closedir, dirfd, opendir: port to OpenSolaris 5.10
> bootstrap: use American spelling
> @item needed inside @itemize
> hash-pjw-bare: fix comment
> wcwidth: Replace also on OpenBSD 5.8
> update from texinfo
> gnu-web-doc-update: fix addition of new files
> utimens-tests: avoid pulling gettext .m4 files
> regex: pacify static checkers
> regex: fix [ diagnostic
> regex: fix memory leaks
> fts: don't unconditionally use leaf optimization for NFS
> * gnulib-tool: fix stray debug line in previous patch
> gnulib-tool: don't assume ln -s works
> utimes: detect utimes() correctly on OS/2 kLIBC
> openat_proc_name: port to OS/2 kLIBC
> stdint: check _INTPTR_T_DECLARED for intptr_t etc.
> doc: mention unfixed issues with unsupported localtime() values
> Go back to gettext-0.19.7
> opendir, closedir, dirfd, fdopendir: port to OS/2 kLIBC
> dup, dup2, fcntl: support a directory fd on OS/2 kLIBC
> pipe_filter_ii_execute: port to OS/2 kLIBC
> wchar: fix "conflicting types" error for __wcwidth on OS/2 kLIBC
> w32spawn: clear SHELL_SPECIAL_CHARS and SHELL_SPACE_CHAR on OS/2 kLIBC
> pipe-filter-aux: undefine HAVE_SELECT on KLIBC
> binary-io: don't put fd in binary mode if it is a console on EMX
> doc: mention setlocale() issues on OpenBSD
> sig2str: list all signals on FreeBSD >= 7
> acl-permissions: port to USE_ACL==0 platforms
> mktime: rename macro to avoid glibc clash
> Port "$@" to OpenIndiana ksh93
> autoupdate
> Port Universal Time settings to strict POSIX
> update from texinfo
> update from texinfo
.gnulib | 2 +-
bootstrap | 6 +++---
tests/virstringtest.c | 9 +++------
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/.gnulib b/.gnulib
index 6cc32c6..8d807a9 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 6cc32c63e80bc1a30c521b2f07f2b54909b59892
+Subproject commit 8d807a99c6e8eecd2a9cf7c7b5d48ec0b2c934f8
diff --git a/bootstrap b/bootstrap
index 294c0bc..f060bab 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2014-12-08.12; # UTC
+scriptversion=2016-01-24.06; # UTC
# Bootstrap this package from checked-out sources.
@@ -42,7 +42,7 @@ export LC_ALL
local_gl_dir=gl
-# Honour $PERL, but work even if there is none
+# Honor $PERL, but work even if there is none.
PERL="${PERL-perl}"
me=$0
@@ -1021,6 +1021,6 @@ echo "$0: done. Now you can run './configure'."
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index 7a1dcfd..63b8009 100644
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Red Hat, Inc.
+ * Copyright (C) 2012-2016 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
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include "testutils.h"
-#include "intprops.h"
#include "verify.h"
#include "virerror.h"
#include "viralloc.h"
@@ -409,13 +408,11 @@ struct stringToLongData {
/* This test makes assumptions about our compilation platform that are
* not guaranteed by POSIX. Good luck to you if you are crazy enough
- * to try and port libvirt to a platform with 16-bit int. */
+ * to try and port libvirt to a platform with 16-bit int. Gnulib
+ * already assumes that signed integers are two's complement. */
verify(sizeof(int) == 4);
-verify(TYPE_TWOS_COMPLEMENT(int));
verify(sizeof(long) == sizeof(int) || sizeof(long) == sizeof(long long));
-verify(TYPE_TWOS_COMPLEMENT(long));
verify(sizeof(long long) == 8);
-verify(TYPE_TWOS_COMPLEMENT(long long));
static int
testStringToLong(const void *opaque)
--
2.5.5
9 years
[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake
Fix a regression in checking for realpath (which caused link
failures regarding duplicate rpl_canonicalize_file_name), and
fix the mingw build regarding unsetenv.
* .gnulib: Update to latest.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
Fixes the reported failure with canonicalize_file_name,
but there's still the issue of new gcc warnings enabled
which affect F24 with its newer gcc.
.gnulib | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
* .gnulib 8d807a9...246b3b2 (3):
> canonicalize: Fix broken probe for realpath.
> unsetenv: relax to LGPLv2+
> update from texinfo
diff --git a/.gnulib b/.gnulib
index 8d807a9..246b3b2 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 8d807a99c6e8eecd2a9cf7c7b5d48ec0b2c934f8
+Subproject commit 246b3b28808ee5f4664be674dce573af9497fc7a
--
2.5.5
9 years
[libvirt] inconsistency in attribute usage between hv drivers
by Laine Stump
I just came across this problem while looking for the proper place to
put <ip> info for the host side of <interface type='ethernet'>. I don't
think there's really anything that can be done about it now, since
everything below has been in place for so long, but maybe it can serve
as a cautionary tale.
Prologue: A week or two ago, I made patches to support <interface
type='ethernet'> in the LXC driver. I did this not because I have a need
for that, but because it seemed like the perfect avenue for
investigating the best way to add IP address and route config to
<interface>, as it is one environment where we have a need *and* the
ability to setup IP info for both the host and guest sides of the
interface. I accomplished this by simply generalizing the existing
<interface type='bridge'> code to not attach the host-side veth device
to a bridge.
This makes all common attributes between type='ethernet' and
type='bridge' consistent, including the configuration of guest-side and
host-side device names, and here we come to the first inconsistency -
the device name for the veth/tap on the host side is in the <target>
element (which I've always been told is supposed to be used for
device-specific info about how the device will be presented on the
*guest* side, but I suppose this is because <interface type='direct'>
uses <source dev='blah'> to provide the name of the physical device that
the macvtap device (named in <target dev='macvblah'/> is attached to).
And I guess because the dev attribute was already in-use in <target> the
much more recently added guest-side name is given in the <guest>
subelement (in LXC at least):
<interface type='ethernet'>
<target dev='hostblah'/> <-- name of veth on host side
<guest dev='guestblah'/> <-- name of veth on guest side
...
Now, this "is what it is". There is no changing it. In particular, the
use of <target dev> for the host-side device name has been in use for so
long and is so deeply ingrained that it's just part of the scenery.
Moving for a minute to the IP address/route info for the guest side is
already configured in the toplevel <ip> and <route> subelements of
<interface>,
<interface type='ethernet'>
<ip address='1.2.3.4' .../>
</interface>
My first thought was to put the <ip> for the host side inside <source>:
<interface type='ethernet'>
<source>
<ip address='1.2.3.5' .../> <-- host side
</source>
<ip address='1.2.3.4' .../> <-- guest side
</interface>
That makes sense to me because it parallels what we do with PCI
addresses for hostdev - the PCI address in <source> tells what the
address is on the host, and the one at the toplevel of <hostdev> tells
what the PCI address will be in the guest. It *doesn't* fit well with
the fact that the device we're setting up is named in <target> though,
so we're already inconsistent, but putting the host-side IP config in
<target> seems like an invitation to mix things up even more in the
future, since <target> is used everywhere else as a place to put stuff
related to what the device looks like in the guest (although... for
<interface>, <target> *is* currently used only for the host-side
tap/veth device name; so maybe we just can define the purpose of
<target> differently in this one case... But I digress).
So I went to the code to add parsing of <ip> inside <source>, and found
that the type-specific data for ethernet has a dev, and that field in
the object is set during parsing from <source dev='blah'/>, *and* that
the openvz driver uses that dev name as the name of the network device
in the *guest*! (even though my understanding of <source> is that it is
supposed to be used for information about the *host* side of any device.
Sigh.) So on openvz, we have this:
<interface type='ethernet'>
<target dev='hostblah'/> <-- name of interface on host side
<source dev='guestblah'/> <-- name of interface on guest side
...
which seems exactly the opposite of what it should be. Note that this
doesn't seem to be documented anywhere except in the few lines in
openvz_driver.c that implement it. (Note that, prior to commit 9a4b705f7
back in 2010, which added support for type='ethernet' in openvz, the
"dev" field was already in the ethernet-specific sub-object of
virDomainNetDef, but it was only used to hold the name of the bridge
that a tap device was attached to when converting from a qemu
commandline to XML (also, as previously stated, for type='direct' it is
used to name the physical device on the host that the macvtap interface
is connected to, i.e. *exactly* the opposite end of the chain). It looks
like the poster of the openvz patch just saw an opportune
existing-but-unused-by-type=ethernet attribute and took advantage, and
it wasn't noticed in review).
I'm actually skeptical that anyone even uses this, since openvz is a
less-used driver, type='ethernet' is less used among interface types,
and even after that it's valid to not provide a name, in which case one
is automatically generated. But there is no way to verify that, so we're
stuck with it. It is true that the LXC version of type='ethernet' was
added only a few days ago, and there hasn't yet been a release, so I
*could* modify it to be consistent with the attribute usage in the
openvz driver. But that would make <interface type='ethernet'> in LXC
inconsistent with <interface type='bridge'> in LXC, which is a much
worse situation. IT seems there is nothing to change. As I said above
"it is what it is".
So why am I writing this message? Partly to just vent frustration (aka
"whine") I suppose :-). Also partly as public testimony that my
seemingly excessive worrying over attribute naming and placement is
justified, and not just OCD. Also, as I said above, as a cautionary tale
that any patch adding *any* XML config knob, or making use of an
existing XML config knob needs extra scrutiny to help minimize such
messes in the future.
9 years
[libvirt] [PATCH] unsetenv: relax to LGPLv2+
by Eric Blake
Especially since setenv is also LGPLv2+, and it makes sense for the
two modules to stay in sync.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
Libvirt wants LGPLv2+ when it uses gnulib, and recently ran into
a problem where it can use the setenv module for mingw but not the
unsetenv module. Barring any negative reviews, I'll push this in
24 hours, or sooner if I get a positive review; then libvirt will
have to pick up the latest gnulib to make use of it.
modules/unsetenv | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/unsetenv b/modules/unsetenv
index 015ac4e..909cec9 100644
--- a/modules/unsetenv
+++ b/modules/unsetenv
@@ -24,7 +24,7 @@ Include:
<stdlib.h>
License:
-LGPL
+LGPLv2+
Maintainer:
all
--
2.5.5
9 years
[libvirt] [PATCH] lxc: Fix virLXCDomainObjBeginJob position in lxcDomainSetMemoryParameters
by Katerina Koukiou
Adjust the code to perform the virLXCDomainObjBeginJob first
and then the call virDomainLiveConfigHelperMethod.
As Ján Tomko pointed out, in virDomainLiveConfigHelperMethod,
there is a check to see if the domain is active when AFFECT_LIVE is set.
Since virLXCDomainObjBeginJob unlocks the virDomainObjPtr lock,
the domain could possibly be destroyed while we wait for the job
and the check results would no longer be valid.
Signed-off-by: Katerina Koukiou <k.koukiou(a)gmail.com>
---
src/lxc/lxc_driver.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 3aadd64..f883ffb 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -841,14 +841,16 @@ lxcDomainSetMemoryParameters(virDomainPtr dom,
cfg = virLXCDriverGetConfig(driver);
if (virDomainSetMemoryParametersEnsureACL(dom->conn, vm->def, flags) < 0 ||
- !(caps = virLXCDriverGetCapabilities(driver, false)) ||
- virDomainLiveConfigHelperMethod(caps, driver->xmlopt,
- vm, &flags, &vmdef) < 0)
+ !(caps = virLXCDriverGetCapabilities(driver, false)))
goto cleanup;
if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_MODIFY) < 0)
goto cleanup;
+ if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt,
+ vm, &flags, &vmdef) < 0)
+ goto endjob;
+
if (flags & VIR_DOMAIN_AFFECT_LIVE &&
!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_MEMORY)) {
virReportError(VIR_ERR_OPERATION_INVALID,
--
2.7.4
9 years
