- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: format server interface without a listen address
by Ján Tomko 21 Jan '15

21 Jan '15

https://bugzilla.redhat.com/show_bug.cgi?id=1130390 The listen address is not mandatory for <interface type='server'> but when it's not specified, we've been formatting it as: -netdev socket,listen=(null):5558,id=hostnet0 which failed with: Device 'socket' could not be initialized Omit the address completely and only format the port in the listen attribute. --- docs/schemas/domaincommon.rng | 10 ++++++++++ src/qemu/qemu_command.c | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args | 4 +++- tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml | 5 +++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index c428ddf..9d6c1ee 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2207,6 +2207,16 @@ <empty/> </element> </optional> + <optional> + <element name="model"> + <attribute name="type"> + <data type="string"> + <param name='pattern'>[a-zA-Z0-9\-_]+</param> + </data> + </attribute> + <empty/> + </element> + </optional> </interleave> </group> <group> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c041ee7..7e1f3d0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4576,7 +4576,8 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, case VIR_DOMAIN_NET_TYPE_SERVER: virBufferAsprintf(&buf, "socket%clisten=%s:%d", type_sep, - net->data.socket.address, + net->data.socket.address ? net->data.socket.address + : "", net->data.socket.port); type_sep = ','; break; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args index 26daac3..ac43630 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args @@ -7,4 +7,6 @@ pc -m 214 -smp 1 -nographic -nodefaults -monitor unix:/tmp/test-monitor,server,n -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x3 \ -chardev socket,id=charnet1,path=/tmp/vhost1.sock \ -netdev type=vhost-user,id=hostnet1,chardev=charnet1 \ --device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x4 +-device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x4 \ +-netdev socket,listen=:2015,id=hostnet2 \ +-device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml index e5b6242..fa09157 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.xml @@ -33,6 +33,11 @@ <source type='unix' path='/tmp/vhost1.sock' mode='client'/> <model type='virtio'/> </interface> + <interface type='server'> + <mac address='52:54:00:95:db:c0'/> + <source port='2015'/> + <model type='rtl8139'/> + </interface> <memballoon model='none'/> </devices> </domain> -- 2.0.4

2 1

[libvirt] [PATCH] tests: fix xlconfigtest build failure
by Jim Fehlig 21 Jan '15

21 Jan '15

When libvirt is configured --without-xen, building the xlconfigtest fails with CCLD xlconfigtest /usr/lib/gcc/x86_64-linux-gnu/4.7/../../../x86_64-linux-gnu/crt1.o In function `_start': (.text+0x20): undefined reference to `main' collect2: error: ld returned 1 exit status Introduced in commit 4ed5fb91 by too much copy and paste from xmconfigtest. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- tests/Makefile.am | 17 ++++++++++++----- tests/xlconfigtest.c | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index b16d3d5..1d838a5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -483,11 +483,6 @@ sexpr2xmltest_SOURCES = \ testutils.c testutils.h sexpr2xmltest_LDADD = $(xen_LDADDS) -xlconfigtest_SOURCES = \ - xlconfigtest.c testutilsxen.c testutilsxen.h \ - testutils.c testutils.h -xlconfigtest_LDADD =$(xen_LDADDS) - xmconfigtest_SOURCES = \ xmconfigtest.c testutilsxen.c testutilsxen.h \ testutils.c testutils.h @@ -511,6 +506,18 @@ EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \ testutilsxen.c testutilsxen.h endif ! WITH_XEN +if WITH_LIBXL +libxl_LDADDS = ../src/libvirt_driver_libxl_impl.la +libxl_LDADDS += $(LDADDS) + +xlconfigtest_SOURCES = \ + xlconfigtest.c testutilsxen.c testutilsxen.h \ + testutils.c testutils.h +xlconfigtest_LDADD =$(libxl_LDADDS) +else ! WITH_LIBXL +EXTRA_DIST += xlconfigtest.c +endif ! WITH_LIBXL + QEMUMONITORTESTUTILS_SOURCES = \ qemumonitortestutils.c \ qemumonitortestutils.h \ diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index c2763c0..8c4c82c 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -36,7 +36,7 @@ #include "virstring.h" #include "testutils.h" #include "testutilsxen.h" -#include "xen/xen_driver.h" +#include "libxl/libxl_conf.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -198,7 +198,7 @@ mymain(void) if (!(caps = testXLInitCaps())) return EXIT_FAILURE; - if (!(xmlopt = xenDomainXMLConfInit())) + if (!(xmlopt = libxlCreateXMLConf())) return EXIT_FAILURE; #define DO_TEST(name, version) \ -- 1.8.4.5

2 2

Re: [libvirt] [Xen-devel] [libvirt bisection] complete build-armhf-libvirt
by Ian Campbell 21 Jan '15

21 Jan '15

On Mon, 2015-01-19 at 09:37 +0000, Ian Campbell wrote: > On Mon, 2015-01-19 at 04:48 +0000, xen.org wrote: > > branch xen-unstable > > xen branch xen-unstable > > job build-armhf-libvirt > > test libvirt-build > > > > Tree: libvirt git://libvirt.org/libvirt.git > > Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-unstable.git > > Tree: xen git://xenbits.xen.org/xen.git > > > > *** Found and reproduced problem changeset *** > > > > Bug is in tree: libvirt git://libvirt.org/libvirt.git > > Bug introduced: 2c78051a14acfb7aba078d569b1632dfe0ca0853 > > Bug not present: 7ad117b2e33039737126ce9df7a267a6f939988d > > > > > > commit 2c78051a14acfb7aba078d569b1632dfe0ca0853 > > Author: Kiarie Kahurani <davidkiarie4(a)gmail.com> > > Date: Thu Sep 11 07:10:33 2014 +0300 > > > > src/xenconfig: Xen-xl parser > > This has since been reverted and done again differently, so nothing to > worry about I think. That said the latest failure is http://www.chiark.greenend.org.uk/~xensrcts/logs/33553/build-amd64-libvirt/… CC virdbustest-testutils.o CC virsystemdtest-virsystemdtest.o CC virsystemdtest-testutils.o CC virdrivermoduletest.o CCLD xlconfigtest CC qemuxml2argvtest.o /usr/lib/gcc/x86_64-linux-gnu/4.7/../../../x86_64-linux-gnu/crt1.o: In function `_start': (.text+0x20): undefined reference to `main' collect2: error: ld returned 1 exit status (from http://www.chiark.greenend.org.uk/~xensrcts/logs/33553/ ) The bisector is working on it, partial result at: http://www.chiark.greenend.org.uk/~xensrcts/results/bisect.libvirt.build-am… I'll mail the result when it arrives. Ian.

2 1

[libvirt] [PATCH 0/3] Support for per-thread scheduling settings
by Martin Kletzander 20 Jan '15

20 Jan '15

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1178986 Martin Kletzander (3): util: Add virProcessSetScheduler() function for scheduler settings docs, schema, conf: Add support for setting scheduler parameters of guest threads qemu: Add support for setting vCPU and I/O thread scheduler setting docs/formatdomain.html.in | 13 +++ docs/schemas/domaincommon.rng | 33 ++++++ src/conf/domain_conf.c | 137 +++++++++++++++++++++++- src/conf/domain_conf.h | 24 +++++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 7 +- src/qemu/qemu_process.c | 76 ++++++++++++- src/qemu/qemu_process.h | 5 +- src/util/virprocess.c | 46 +++++++- src/util/virprocess.h | 6 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 4 + 11 files changed, 345 insertions(+), 7 deletions(-) -- 2.2.1

2 11

[libvirt] Question about migration max downtime in domXML
by Jim Fehlig 20 Jan '15

20 Jan '15

Hi All, I've had a few user requests to add migration max downtime to the domain XML. IIRC, this was discussed on the list quite some time ago, but I'm unable to find it in the archives. My recollection is that max downtime is considered a tunable vs config and as such not included in the domXML. But domXML does contain quite a few tunables, so perhaps my memory is incorrect. Does anyone recall the details? I'd be happy to work on this if folks find it acceptable. Regards, Jim

2 2

[libvirt] [PATCH] qemu: Propagate storage errors on migration
by Michal Privoznik 20 Jan '15

20 Jan '15

There's one bug that got more visible with my patches that automatically precreate storage on migration. The problem is, if there's not enough disk space on destination, we successfully finish the migration instead of failing. Firstly, we instruct qemu to copy the storage. And as it copies the data, one write() will return -ENOSPC, eventually, to which qemu reacts by emitting BLOCK_JOB_ERROR. The event is successfully ignored by us. Then, since the block job has finished, BLOCK_JOB_COMPLETED event is emitted too. Secondly, we are not checking for the block job completion as we should. Currently, we do the check by issuing 'query-block-jobs' and then looking in the command's output for the job we are interested in. If course, we don't fail if the job is not there, in which case the number of total bytes to be transferred and bytes already transferred, well they equal both to zero. This is actually the line causing the bug as it sees both numbers equal to each other and gives green light to the actual migration. The fix consist of two parts: In the first, code handling BLOCK_JOB_ERROR is added. It's a monitor event and we should have handler for that anyway. In the second part, the code doing drive mirroring is rewritten so it waits for the events instead of querying on the monitor repeatedly. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_migration.c | 25 +++++++------------------ src/qemu/qemu_monitor_json.c | 10 ++++++++++ src/qemu/qemu_process.c | 14 ++++++++++++++ 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d1a483a..751a9b5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -787,7 +787,8 @@ VIR_ENUM_IMPL(virDomainDiskMirrorState, VIR_DOMAIN_DISK_MIRROR_STATE_LAST, "none", "yes", "abort", - "pivot") + "pivot", + "error") VIR_ENUM_IMPL(virDomainLoader, VIR_DOMAIN_LOADER_TYPE_LAST, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ac1f4f8..f18fa80 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -654,6 +654,7 @@ typedef enum { VIR_DOMAIN_DISK_MIRROR_STATE_READY, /* Job in second phase */ VIR_DOMAIN_DISK_MIRROR_STATE_ABORT, /* Job aborted, waiting for event */ VIR_DOMAIN_DISK_MIRROR_STATE_PIVOT, /* Job pivoted, waiting for event */ + VIR_DOMAIN_DISK_MIRROR_STATE_ERROR, /* Job failed */ VIR_DOMAIN_DISK_MIRROR_STATE_LAST } virDomainDiskMirrorState; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 77e0b35..e2309ea 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1743,7 +1743,6 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk = vm->def->disks[i]; - virDomainBlockJobInfo info; /* skip shared, RO and source-less disks */ if (disk->src->shared || disk->src->readonly || @@ -1768,6 +1767,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, if (mon_ret < 0) goto error; + disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_COPY; lastGood = i; /* wait for completion */ @@ -1775,38 +1775,27 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, /* Poll every 500ms for progress & to allow cancellation */ struct timespec ts = { .tv_sec = 0, .tv_nsec = 500 * 1000 * 1000ull }; - memset(&info, 0, sizeof(info)); - - if (qemuDomainObjEnterMonitorAsync(driver, vm, - QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) - goto error; if (priv->job.asyncAbort) { /* explicitly do this *after* we entered the monitor, * as this is a critical section so we are guaranteed * priv->job.asyncAbort will not change */ - qemuDomainObjExitMonitor(driver, vm); priv->job.current->type = VIR_DOMAIN_JOB_CANCELLED; virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), qemuDomainAsyncJobTypeToString(priv->job.asyncJob), _("canceled by client")); goto error; } - mon_ret = qemuMonitorBlockJobInfo(priv->mon, diskAlias, &info, - NULL); - qemuDomainObjExitMonitor(driver, vm); - if (mon_ret < 0) - goto error; - - if (info.cur == info.end) { + if (disk->mirrorState == VIR_DOMAIN_DISK_MIRROR_STATE_READY) { VIR_DEBUG("Drive mirroring of '%s' completed", diskAlias); break; + } else if (disk->mirrorState == VIR_DOMAIN_DISK_MIRROR_STATE_ERROR) { + virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + _("canceled by destination")); + goto error; } - /* XXX Frankly speaking, we should listen to the events, - * instead of doing this. But this works for now and we - * are doing something similar in migration itself anyway */ - virObjectUnlock(vm); nanosleep(&ts, NULL); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e567aa7..5d6bbca 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -76,6 +76,7 @@ static void qemuMonitorJSONHandlePMWakeup(qemuMonitorPtr mon, virJSONValuePtr da static void qemuMonitorJSONHandlePMSuspend(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleBlockJobCompleted(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleBlockJobCanceled(qemuMonitorPtr mon, virJSONValuePtr data); +static void qemuMonitorJSONHandleBlockJobError(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleBlockJobReady(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleBalloonChange(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandlePMSuspendDisk(qemuMonitorPtr mon, virJSONValuePtr data); @@ -94,6 +95,7 @@ static qemuEventHandler eventHandlers[] = { { "BLOCK_IO_ERROR", qemuMonitorJSONHandleIOError, }, { "BLOCK_JOB_CANCELLED", qemuMonitorJSONHandleBlockJobCanceled, }, { "BLOCK_JOB_COMPLETED", qemuMonitorJSONHandleBlockJobCompleted, }, + { "BLOCK_JOB_ERROR", qemuMonitorJSONHandleBlockJobError, }, { "BLOCK_JOB_READY", qemuMonitorJSONHandleBlockJobReady, }, { "DEVICE_DELETED", qemuMonitorJSONHandleDeviceDeleted, }, { "DEVICE_TRAY_MOVED", qemuMonitorJSONHandleTrayChange, }, @@ -842,6 +844,14 @@ qemuMonitorJSONHandleBlockJobCanceled(qemuMonitorPtr mon, } static void +qemuMonitorJSONHandleBlockJobError(qemuMonitorPtr mon, + virJSONValuePtr data) +{ + qemuMonitorJSONHandleBlockJobImpl(mon, data, + VIR_DOMAIN_BLOCK_JOB_FAILED); +} + +static void qemuMonitorJSONHandleBlockJobReady(qemuMonitorPtr mon, virJSONValuePtr data) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c18204b..b29ecf1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1110,6 +1110,20 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN; save = true; } + } else if (disk->mirrorJob == VIR_DOMAIN_BLOCK_JOB_TYPE_COPY) { + switch ((virConnectDomainEventBlockJobStatus) status) { + case VIR_DOMAIN_BLOCK_JOB_READY: + case VIR_DOMAIN_BLOCK_JOB_COMPLETED: + disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_READY; + break; + case VIR_DOMAIN_BLOCK_JOB_CANCELED: + case VIR_DOMAIN_BLOCK_JOB_FAILED: + disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_ERROR; + break; + case VIR_DOMAIN_BLOCK_JOB_LAST: + VIR_DEBUG("should not get here"); + break; + } } } -- 2.0.5

2 2

[libvirt] [PATCH] Fix virCgroupNewMachine prototype on non-Linux
by Ján Tomko 20 Jan '15

20 Jan '15

Commit 318df5a changed the prototype of virCgroupNewMachine without adjusting the stub function for platforms without cgroups. --- Pushed as a trivial build fix. src/util/vircgroup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index f5f617e..fe34290 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -4073,6 +4073,8 @@ virCgroupNewMachine(const char *name ATTRIBUTE_UNUSED, const char *rootdir ATTRIBUTE_UNUSED, pid_t pidleader ATTRIBUTE_UNUSED, bool isContainer ATTRIBUTE_UNUSED, + size_t nnicindexes ATTRIBUTE_UNUSED, + int *nicindexes ATTRIBUTE_UNUSED, const char *partition ATTRIBUTE_UNUSED, int controllers ATTRIBUTE_UNUSED, virCgroupPtr *group ATTRIBUTE_UNUSED) -- 2.0.4

1 0

[libvirt] glibc detected invalid pointer
by shaowt 20 Jan '15

20 Jan '15

hi all: when i use vnc to connect VM, sometimes in libvirt logs, i found glibc detected invalid pointer error,and then this vm will be shutdown . “The information (including any attachments) contained in this e-mail is confidential and may be legally privileged . The message is intended solely for the addressee(s). If this e-mail is not originally intended for you, or received by you in error, please contact the sender by return e-mail and do not disclose its content to anyone and destroy all copies of the original message immediately. If you are not the intended recipient, you are hereby notified that any use, dissemination, or reproduction is strictly prohibited and may be unlawful. 本邮件（包括任何附件）包含机密信息，并受法律保护。此信息意在使收件人明确以下内容：如果您并非该收件人或错收此邮件，请联系发件人并退还此邮件，请不要向任何人泄露邮件内容，请立即删除所有邮件及其附件。严禁任何使用，传播或复制此邮件的行为，这些行为可能违反法律。“

2 3

[libvirt] [PATCH v2] network: Let domains be restricted to local DNS
by Josh Stone 20 Jan '15

20 Jan '15

This adds a new "localOnly" attribute on the domain element of the network xml. With this set to "yes", DNS requests under that domain will only be resolved by libvirt's dnsmasq, never forwarded upstream. This was how it worked before commit f69a6b987d616, and I found that functionality useful. For example, I have my host's NetworkManager dnsmasq configured to forward that domain to libvirt's dnsmasq, so I can easily resolve guest names from outside. But if libvirt's dnsmasq doesn't know a name and forwards it to the host, I'd get an endless forwarding loop. Now I can set localOnly="yes" to prevent the loop. Signed-off-by: Josh Stone <jistone(a)redhat.com> Cc: Laine Stump <laine(a)laine.org> --- docs/formatnetwork.html.in | 12 +++++++- docs/schemas/network.rng | 3 ++ src/conf/network_conf.c | 32 ++++++++++++++++++++-- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 5 ++++ .../nat-network-dns-local-domain.conf | 14 ++++++++++ .../nat-network-dns-local-domain.xml | 9 ++++++ tests/networkxml2conftest.c | 1 + 8 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 tests/networkxml2confdata/nat-network-dns-local-domain.conf create mode 100644 tests/networkxml2confdata/nat-network-dns-local-domain.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index dc438aee8622..defcdba00930 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -82,7 +82,7 @@ <pre> ... <bridge name="virbr0" stp="on" delay="5"/> - <domain name="example.com"/> + <domain name="example.com" localOnly="no"/> <forward mode="nat" dev="eth0"/> ...</pre> @@ -113,6 +113,16 @@ a <code><forward></code> mode of "nat" or "route" (or an isolated network with no <code><forward></code> element). Since 0.4.5 + + + If the optional <code>localOnly</code> attribute on the + <code>domain</code> element is "yes", then DNS requests under + this domain will only be resolved by the virtual network's own + DNS server - they will not be forwarded to the host's upstream + DNS server. If <code>localOnly</code> is "no", and by + default, unresolved requests will be forwarded. + Since 1.2.11 + </dd> <dt><code>forward</code></dt> <dd>Inclusion of the <code>forward</code> element indicates that diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 4546f8037580..a1da28092375 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -225,6 +225,9 @@ <optional> <element name="domain"> <attribute name="name"><ref name="dnsName"/></attribute> + <optional> + <attribute name="localOnly"><ref name="virYesNo"/></attribute> + </optional> </element> </optional> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 97719ed536de..31b765ff2c51 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2083,6 +2083,18 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) /* Parse network domain information */ def->domain = virXPathString("string(./domain[1]/@name)", ctxt); + tmp = virXPathString("string(./domain[1]/@localOnly)", ctxt); + if (tmp) { + def->domain_local = virTristateBoolTypeFromString(tmp); + if (def->domain_local <= 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid domain localOnly setting '%s' " + "in network '%s'"), + tmp, def->name); + goto error; + } + VIR_FREE(tmp); + } if ((bandwidthNode = virXPathNode("./bandwidth", ctxt)) != NULL && (def->bandwidth = virNetDevBandwidthParse(bandwidthNode, -1)) == NULL) @@ -2805,8 +2817,24 @@ virNetworkDefFormatBuf(virBufferPtr buf, virBufferAsprintf(buf, "<mac address='%s'/>\n", macaddr); } - if (def->domain) - virBufferAsprintf(buf, "<domain name='%s'/>\n", def->domain); + if (def->domain) { + virBufferAsprintf(buf, "<domain name='%s'", def->domain); + + /* default to "no", but don't format it in the XML */ + if (def->domain_local) { + const char *local = virTristateBoolTypeToString(def->domain_local); + + if (!local) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown localOnly type %d in network"), + def->domain_local); + return -1; + } + virBufferAsprintf(buf, " localOnly='%s'", local); + } + + virBufferAddLit(buf, "/>\n"); + } if (virNetworkDNSDefFormat(buf, &def->dns) < 0) goto error; diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 660cd2d10cd1..bb9724fddbb8 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -232,6 +232,7 @@ struct _virNetworkDef { char *bridge; /* Name of bridge device */ char *domain; + int domain_local; /* enum virTristateBool: yes disables dns forwarding */ unsigned long delay; /* Bridge forward delay (ms) */ bool stp; /* Spanning tree protocol */ virMacAddr mac; /* mac address of bridge device */ diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 9ccc9f8f8de6..f4158517c573 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -928,6 +928,11 @@ networkDnsmasqConfContents(virNetworkObjPtr network, } if (network->def->domain) { + if (network->def->domain_local == VIR_TRISTATE_BOOL_YES) { + virBufferAsprintf(&configbuf, + "local=/%s/\n", + network->def->domain); + } virBufferAsprintf(&configbuf, "domain=%s\n" "expand-hosts\n", diff --git a/tests/networkxml2confdata/nat-network-dns-local-domain.conf b/tests/networkxml2confdata/nat-network-dns-local-domain.conf new file mode 100644 index 000000000000..5f41b9186cbc --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-local-domain.conf @@ -0,0 +1,14 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +local=/example.com/ +domain=example.com +expand-hosts +except-interface=lo +bind-dynamic +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-local-domain.xml b/tests/networkxml2confdata/nat-network-dns-local-domain.xml new file mode 100644 index 000000000000..a92d71f1f2f6 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-local-domain.xml @@ -0,0 +1,9 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0' /> + <domain name='example.com' localOnly='yes'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 267513f6372c..280db306b6d6 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -134,6 +134,7 @@ mymain(void) DO_TEST("nat-network-dns-hosts", full); DO_TEST("nat-network-dns-forward-plain", full); DO_TEST("nat-network-dns-forwarders", full); + DO_TEST("nat-network-dns-local-domain", full); DO_TEST("dhcp6-network", dhcpv6); DO_TEST("dhcp6-nat-network", dhcpv6); DO_TEST("dhcp6host-routed-network", dhcpv6); -- 2.1.0

2 1

[libvirt] [java] [PATCH] JNA: add missing flags parameter to wrapped functions
by Claudio Bley 19 Jan '15

19 Jan '15

Some functions of the Libvirt interface were missing a required flags parameter as defined by the libvirt C API, namely: * virInterfaceCreate * virInterfaceDestroy * virNodeDeviceGetXMLDesc Calling these functions without the flags parameter would result in undefined behaviour, at best in an "unsupported flags" error. --- Reported by Matt Russell via personal email. Thanks, Matt! Pushing under the trivial rule. src/main/java/org/libvirt/Device.java | 2 +- src/main/java/org/libvirt/Interface.java | 4 ++-- src/main/java/org/libvirt/jna/Libvirt.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/libvirt/Device.java b/src/main/java/org/libvirt/Device.java index a3b20b8..3c876c6 100644 --- a/src/main/java/org/libvirt/Device.java +++ b/src/main/java/org/libvirt/Device.java @@ -118,7 +118,7 @@ public class Device { * @throws LibvirtException */ public String getXMLDescription() throws LibvirtException { - return processError(libvirt.virNodeDeviceGetXMLDesc(VDP)); + return processError(libvirt.virNodeDeviceGetXMLDesc(VDP, 0)); } /** diff --git a/src/main/java/org/libvirt/Interface.java b/src/main/java/org/libvirt/Interface.java index e0ddc3f..4c9670c 100644 --- a/src/main/java/org/libvirt/Interface.java +++ b/src/main/java/org/libvirt/Interface.java @@ -52,7 +52,7 @@ public class Interface { * @throws LibvirtException */ public int create() throws LibvirtException { - return processError(libvirt.virInterfaceCreate(VIP)); + return processError(libvirt.virInterfaceCreate(VIP, 0)); } /** @@ -71,7 +71,7 @@ public class Interface { * @throws LibvirtException */ public int destroy() throws LibvirtException { - return processError(libvirt.virInterfaceDestroy(VIP)); + return processError(libvirt.virInterfaceDestroy(VIP, 0)); } @Override diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 4d76071..a17bfc7 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -350,7 +350,7 @@ public interface Libvirt extends Library { String virNodeDeviceGetParent(DevicePointer virDevicePointer); int virNodeDeviceNumOfCaps(DevicePointer virDevicePointer); int virNodeDeviceListCaps(DevicePointer virDevicePointer, Pointer[] names, int maxNames); - String virNodeDeviceGetXMLDesc(DevicePointer virDevicePointer); + String virNodeDeviceGetXMLDesc(DevicePointer virDevicePointer, int flags); int virNodeDeviceFree(DevicePointer virDevicePointer); int virNodeDeviceDettach(DevicePointer virDevicePointer); int virNodeDeviceReAttach(DevicePointer virDevicePointer); @@ -402,9 +402,9 @@ public interface Libvirt extends Library { int virStorageVolResize(StorageVolPointer storageVolPtr, long capacity, int flags); // Interface Methods - int virInterfaceCreate(InterfacePointer virDevicePointer); + int virInterfaceCreate(InterfacePointer virDevicePointer, int flags); InterfacePointer virInterfaceDefineXML(ConnectionPointer virConnectPtr, String xml, int flags); - int virInterfaceDestroy(InterfacePointer virDevicePointer); + int virInterfaceDestroy(InterfacePointer virDevicePointer, int flags); int virInterfaceFree(InterfacePointer virDevicePointer); String virInterfaceGetName(InterfacePointer virInterfacePtr); String virInterfaceGetMACString(InterfacePointer virInterfacePtr); -- 2.2.2

1 0