- Devel - libvirt List Archives

[libvirt] [PATCH] virDomainEventCallbackListAddID: allow different domains to register lifecycle events
by boettcher＠tudos.org 29 Jun '11

29 Jun '11

Hello, I had trouble of registering an VIR_DOMAIN_EVENT_ID_LIFECYLCE event for different domains separately. First I invoke [0] with one domain, and later with another one. For the second call the operation will be denied by "libvir: error : internal error event callback already tracked". I assume this should be possible for different domains to register LIFECYLCE handler separately. In that case please consider the attached patch. Thanks, Alex B. [0] virConnectDomainEventRegisterAny( conn, domX, VIR_DOM_EVENT_ID_LIFECYLCE, VIR_DOMAIN_EVENT_CALLBACK(myDomainEventCallback2), strdup("callback 2"), myFreeFunc);

1 0

[libvirt] [PATCH] screenshot: Set access rights to temporary file
by Michal Privoznik 29 Jun '11

29 Jun '11

Although we create a temporary file, it is owned by root:root and have rights 0600. In case qemu does not run under root, it is unable to write to that file and thus we transfer 0B sized file. --- src/qemu/qemu_driver.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8b65c26..562ec42 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2729,6 +2729,8 @@ qemuDomainScreenshot(virDomainPtr dom, goto endjob; } + virSecurityManagerSetSavedStateLabel(qemu_driver->securityManager, vm, tmp); + qemuDomainObjEnterMonitor(vm); if (qemuMonitorScreendump(priv->mon, tmp) < 0) { qemuDomainObjExitMonitor(vm); -- 1.7.5.rc3

2 2

[libvirt] [PATCH] dnsmasq: Fix errno handling and don't unlink non-existing files
by Matthias Bolte 29 Jun '11

29 Jun '11

addnhostsSave and hostsfileSave expect < 0 return value on error from addnhostsWrite and hostsfileWrite but then pass err instead of -err to virReportSystemError that expects an errno value. Also addnhostsWrite returns -ENOMEM and errno, change this to -errno. addnhostsWrite and hostsfileWrite tried to unlink the tempfile after renaming it, making both fail on the final step. Remove the unnecessary unlink calls. --- src/util/dnsmasq.c | 44 +++++++++++++++----------------------------- 1 files changed, 15 insertions(+), 29 deletions(-) diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index 5baa34f..aadca10 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -185,14 +185,14 @@ addnhostsWrite(const char *path, if (!(f = fopen(tmp, "w"))) { istmp = false; if (!(f = fopen(path, "w"))) { - rc = errno; + rc = -errno; goto cleanup; } } for (i = 0; i < nhosts; i++) { if (fputs(hosts[i].ip, f) == EOF || fputc('\t', f) == EOF) { - rc = errno; + rc = -errno; VIR_FORCE_FCLOSE(f); if (istmp) @@ -203,7 +203,7 @@ addnhostsWrite(const char *path, for (ii = 0; ii < hosts[i].nhostnames; ii++) { if (fputs(hosts[i].hostnames[ii], f) == EOF || fputc('\t', f) == EOF) { - rc = errno; + rc = -errno; VIR_FORCE_FCLOSE(f); if (istmp) @@ -214,7 +214,7 @@ addnhostsWrite(const char *path, } if (fputc('\n', f) == EOF) { - rc = errno; + rc = -errno; VIR_FORCE_FCLOSE(f); if (istmp) @@ -225,21 +225,14 @@ addnhostsWrite(const char *path, } if (VIR_FCLOSE(f) == EOF) { - rc = errno; + rc = -errno; goto cleanup; } - if (istmp) { - if (rename(tmp, path) < 0) { - rc = errno; - unlink(tmp); - goto cleanup; - } - - if (unlink(tmp) < 0) { - rc = errno; - goto cleanup; - } + if (istmp && rename(tmp, path) < 0) { + rc = -errno; + unlink(tmp); + goto cleanup; } cleanup: @@ -255,7 +248,7 @@ addnhostsSave(dnsmasqAddnHostsfile *addnhostsfile) addnhostsfile->nhosts); if (err < 0) { - virReportSystemError(err, _("cannot write config file '%s'"), + virReportSystemError(-err, _("cannot write config file '%s'"), addnhostsfile->path); return -1; } @@ -402,17 +395,10 @@ hostsfileWrite(const char *path, goto cleanup; } - if (istmp) { - if (rename(tmp, path) < 0) { - rc = -errno; - unlink(tmp); - goto cleanup; - } - - if (unlink(tmp) < 0) { - rc = -errno; - goto cleanup; - } + if (istmp && rename(tmp, path) < 0) { + rc = -errno; + unlink(tmp); + goto cleanup; } cleanup: @@ -428,7 +414,7 @@ hostsfileSave(dnsmasqHostsfile *hostsfile) hostsfile->nhosts); if (err < 0) { - virReportSystemError(err, _("cannot write config file '%s'"), + virReportSystemError(-err, _("cannot write config file '%s'"), hostsfile->path); return -1; } -- 1.7.0.4

2 2

[libvirt] [PATCH 0/9] Misc bug fixes to new RPC code
by Daniel P. Berrange 29 Jun '11

29 Jun '11

This is a series of bug fixes to the new RPC code I have done since I posted the original series, which is now merged. Most of these fixes relate to handling of I/O streams. Patches 1 and 9 also impacted the original code prior to the RPC rewrite, and should be backported by people maintaining old branches

2 20

[libvirt] [PATCH] maint: improve makefile whitespace
by Eric Blake 29 Jun '11

29 Jun '11

None of these instances cause any semantic differences, but consistency is nice. * src/Makefile.am: Replace leading spaces with tabs. --- Pushing under the trivial rule. src/Makefile.am | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7fbbb3f..8f99cc2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -299,13 +299,13 @@ VMWARE_DRIVER_SOURCES = \ 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 \ - vbox/vbox_V2_2.c vbox/vbox_CAPI_v2_2.h \ - vbox/vbox_V3_0.c vbox/vbox_CAPI_v3_0.h \ - vbox/vbox_V3_1.c vbox/vbox_CAPI_v3_1.h \ - vbox/vbox_V3_2.c vbox/vbox_CAPI_v3_2.h \ - vbox/vbox_V4_0.c vbox/vbox_CAPI_v4_0.h + vbox/vbox_glue.c vbox/vbox_glue.h \ + vbox/vbox_driver.c vbox/vbox_driver.h \ + vbox/vbox_V2_2.c vbox/vbox_CAPI_v2_2.h \ + vbox/vbox_V3_0.c vbox/vbox_CAPI_v3_0.h \ + vbox/vbox_V3_1.c vbox/vbox_CAPI_v3_1.h \ + vbox/vbox_V3_2.c vbox/vbox_CAPI_v3_2.h \ + vbox/vbox_V4_0.c vbox/vbox_CAPI_v4_0.h VBOX_DRIVER_EXTRA_DIST = \ vbox/vbox_tmpl.c vbox/README \ @@ -576,7 +576,7 @@ endif WITH_REMOTE %protocol.h: %protocol.x $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)perl -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \ - $< $@ + $< $@ if WITH_XEN if WITH_DRIVER_MODULES @@ -1144,8 +1144,8 @@ libvirt_qemu.def: $(srcdir)/libvirt_qemu.syms # Empty source list - it merely links a bunch of convenience libs together libvirt_la_SOURCES = libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_SYMBOL_FILE) \ - -version-info $(LIBVIRT_VERSION_INFO) \ - $(AM_LDFLAGS) \ + -version-info $(LIBVIRT_VERSION_INFO) \ + $(AM_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) libvirt_la_BUILT_LIBADD += ../gnulib/lib/libgnu.la libvirt_la_LIBADD += $(LIBXML_LIBS) \ @@ -1178,8 +1178,8 @@ libvirt_test_la_CFLAGS = $(AM_CFLAGS) libvirt_qemu_la_SOURCES = libvirt-qemu.c libvirt_qemu_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_QEMU_SYMBOL_FILE) \ - -version-info $(LIBVIRT_VERSION_INFO) \ - $(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) \ + -version-info $(LIBVIRT_VERSION_INFO) \ + $(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) \ $(AM_LDFLAGS) libvirt_qemu_la_CFLAGS = $(AM_CFLAGS) libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) @@ -1407,7 +1407,7 @@ if WITH_NETWORK $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \ rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; } test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \ - ln -s ../default.xml \ + ln -s ../default.xml \ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml endif -- 1.7.4.4

1 0

[libvirt] [PATCH] tests: Fix memory leak in virnetmessagetest
by Osier Yang 29 Jun '11

29 Jun '11

Detected when playing with "make -C tests valgrind". --- tests/virnetmessagetest.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index e707b67..61f457c 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -167,6 +167,7 @@ static int testMessagePayloadEncode(const void *args ATTRIBUTE_UNUSED) { virNetMessageError err; static virNetMessage msg; + int ret = -1; static const char expect[] = { 0x00, 0x00, 0x00, 0x74, /* Length */ 0x11, 0x22, 0x33, 0x44, /* Program */ @@ -204,19 +205,21 @@ static int testMessagePayloadEncode(const void *args ATTRIBUTE_UNUSED) err.code = VIR_ERR_INTERNAL_ERROR; err.domain = VIR_FROM_RPC; + err.level = VIR_ERR_ERROR; + if (VIR_ALLOC(err.message) < 0) - return -1; + goto cleanup; *err.message = strdup("Hello World"); - err.level = VIR_ERR_ERROR; if (VIR_ALLOC(err.str1) < 0) - return -1; + goto cleanup; *err.str1 = strdup("One"); if (VIR_ALLOC(err.str2) < 0) - return -1; + goto cleanup; *err.str2 = strdup("Two"); if (VIR_ALLOC(err.str3) < 0) - return -1; + goto cleanup; *err.str3 = strdup("Three"); + err.int1 = 1; err.int2 = 2; @@ -228,29 +231,39 @@ static int testMessagePayloadEncode(const void *args ATTRIBUTE_UNUSED) msg.header.status = VIR_NET_ERROR; if (virNetMessageEncodeHeader(&msg) < 0) - return -1; + goto cleanup; if (virNetMessageEncodePayload(&msg, (xdrproc_t)xdr_virNetMessageError, &err) < 0) - return -1; + goto cleanup; if (ARRAY_CARDINALITY(expect) != msg.bufferLength) { VIR_DEBUG("Expect message length %zu got %zu", sizeof(expect), msg.bufferLength); - return -1; + goto cleanup; } if (msg.bufferOffset != 0) { VIR_DEBUG("Expect message offset 0 got %zu", msg.bufferOffset); - return -1; + goto cleanup; } if (memcmp(expect, msg.buffer, sizeof(expect)) != 0) { virtTestDifferenceBin(stderr, expect, msg.buffer, sizeof(expect)); - return -1; - } - - return 0; + goto cleanup; + } + + ret = 0; +cleanup: + VIR_FREE(*err.message); + VIR_FREE(*err.str1); + VIR_FREE(*err.str2); + VIR_FREE(*err.str3); + VIR_FREE(err.message); + VIR_FREE(err.str1); + VIR_FREE(err.str2); + VIR_FREE(err.str3); + return ret; } static int testMessagePayloadDecode(const void *args ATTRIBUTE_UNUSED) -- 1.7.1

2 2

[libvirt] [PATCH] conf: Fix memory leak in virNetworkDNSDefFormat
by Osier Yang 29 Jun '11

29 Jun '11

--- src/conf/network_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index d0860d8..45ddee2 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -945,6 +945,7 @@ virNetworkDNSDefFormat(virBufferPtr buf, def->hosts[ii].names[j]); virBufferAsprintf(buf, " </host>\n"); + VIR_FREE(ip); } } -- 1.7.1

2 2

[libvirt] [PATCH] network: Don't ignore errors in dnsmasq config file creation
by Matthias Bolte 29 Jun '11

29 Jun '11

--- This patch depends on https://www.redhat.com/archives/libvir-list/2011-June/msg01423.html src/network/bridge_driver.c | 23 +++++++++++++---------- src/util/dnsmasq.c | 10 ++++------ src/util/dnsmasq.h | 4 ++-- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f48fdcb..f54a966 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -446,7 +446,8 @@ networkBuildDnsmasqHostsfile(dnsmasqContext *dctx, for (i = 0; i < ipdef->nhosts; i++) { virNetworkDHCPHostDefPtr host = &(ipdef->hosts[i]); if ((host->mac) && VIR_SOCKET_HAS_ADDR(&host->ip)) - dnsmasqAddDhcpHost(dctx, host->mac, &host->ip, host->name); + if (dnsmasqAddDhcpHost(dctx, host->mac, &host->ip, host->name) < 0) + return -1; } if (dnsdef) { @@ -454,7 +455,8 @@ networkBuildDnsmasqHostsfile(dnsmasqContext *dctx, virNetworkDNSHostsDefPtr host = &(dnsdef->hosts[i]); if (VIR_SOCKET_HAS_ADDR(&host->ip)) { for (j = 0; j < host->nnames; j++) - dnsmasqAddHost(dctx, &host->ip, host->names[j]); + if (dnsmasqAddHost(dctx, &host->ip, host->names[j]) < 0) + return -1; } } } @@ -600,14 +602,15 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (ipdef->nranges || ipdef->nhosts) virCommandAddArg(cmd, "--dhcp-no-override"); - if (networkBuildDnsmasqHostsfile(dctx, ipdef, network->def->dns) >= 0) { - if (dctx->hostsfile->nhosts) - virCommandAddArgPair(cmd, "--dhcp-hostsfile", - dctx->hostsfile->path); - if (dctx->addnhostsfile->nhosts) - virCommandAddArgPair(cmd, "--addn-hosts", - dctx->addnhostsfile->path); - } + if (networkBuildDnsmasqHostsfile(dctx, ipdef, network->def->dns) < 0) + goto cleanup; + + if (dctx->hostsfile->nhosts) + virCommandAddArgPair(cmd, "--dhcp-hostsfile", + dctx->hostsfile->path); + if (dctx->addnhostsfile->nhosts) + virCommandAddArgPair(cmd, "--addn-hosts", + dctx->addnhostsfile->path); if (ipdef->tftproot) { virCommandAddArgList(cmd, "--enable-tftp", diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index 4bdbb44..5baa34f 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -502,14 +502,13 @@ dnsmasqContextFree(dnsmasqContext *ctx) * * Add dhcp-host entry. */ -void +int dnsmasqAddDhcpHost(dnsmasqContext *ctx, const char *mac, virSocketAddr *ip, const char *name) { - if (ctx->hostsfile) - hostsfileAdd(ctx->hostsfile, mac, ip, name); + return hostsfileAdd(ctx->hostsfile, mac, ip, name); } /* @@ -521,13 +520,12 @@ dnsmasqAddDhcpHost(dnsmasqContext *ctx, * Add additional host entry. */ -void +int dnsmasqAddHost(dnsmasqContext *ctx, virSocketAddr *ip, const char *name) { - if (ctx->addnhostsfile) - addnhostsAdd(ctx->addnhostsfile, ip, name); + return addnhostsAdd(ctx->addnhostsfile, ip, name); } /** diff --git a/src/util/dnsmasq.h b/src/util/dnsmasq.h index 62f6f38..d16a54f 100644 --- a/src/util/dnsmasq.h +++ b/src/util/dnsmasq.h @@ -68,11 +68,11 @@ typedef struct dnsmasqContext * dnsmasqContextNew(const char *network_name, const char *config_dir); void dnsmasqContextFree(dnsmasqContext *ctx); -void dnsmasqAddDhcpHost(dnsmasqContext *ctx, +int dnsmasqAddDhcpHost(dnsmasqContext *ctx, const char *mac, virSocketAddr *ip, const char *name); -void dnsmasqAddHost(dnsmasqContext *ctx, +int dnsmasqAddHost(dnsmasqContext *ctx, virSocketAddr *ip, const char *name); int dnsmasqSave(const dnsmasqContext *ctx); -- 1.7.0.4

2 2

[libvirt] [PATCH] network: Fix dnsmasq hostsfile creation logic and related tests
by Matthias Bolte 29 Jun '11

29 Jun '11

networkSaveDnsmasqHostsfile was added in 8fa9c2214247 (Apr 2010). It has a force flag. If the dnsmasq hostsfile already exists force needs to be true to overwrite it. networkBuildDnsmasqArgv sets force to false, networkDefine sets it to true. This results in the hostsfile being written only in networkDefine in the common case. If no error occurred networkSaveDnsmasqHostsfile returns true and networkBuildDnsmasqArgv adds the --dhcp-hostsfile to the dnsmasq command line. networkSaveDnsmasqHostsfile was changed in 89ae9849f744 (24 Jun 2011) to return a new dnsmasqContext instead of reusing one. This change broke the logic of the force flag as now networkSaveDnsmasqHostsfile returns NULL on error, but the early return -- if force was not set and the hostsfile exists -- returns 0. This turned the early return in an error case and networkBuildDnsmasqArgv didn't add the --dhcp-hostsfile option anymore if the hostsfile already exists. It did because networkDefine created the hostsfile already. Then 9d4e2845d498 fixed the return 0 case in networkSaveDnsmasqHostsfile but didn't apply the force option correctly to the new addnhosts file. Now force doesn't control an early return anymore, but influences the handling of the hostsfile context creation and dnsmasqSave is always called now. This commit also added test cases that reveal several problems. First, the tests now call functions that try to write the dnsmasq config files to disk. If someone runs this tests as root this might overwrite actively used dnsmasq config files, this is a no-go. Also the tests depend onconfigure --localstatedir, this needs to be fixed as well, because it makes the tests fail when localstatedir is different from /var. This patch does several things to fix this: 1) Move dnsmasqContext creation and saving out of networkBuildDnsmasqArgv to the caller to separate the command line generation from the config file writing. This makes the command line generation testable without the risk of interfering with system files, because the tests just don't call dnsmasqSave. 2) This refactoring of networkSaveDnsmasqHostsfile makes the force flag useless as the saving happens somewhere else now. This fixes the wrong usage of the force flag in combination with then newly added addnhosts file by removing the force flag. 3) Adapt the wrong test cases to the correct behavior, by adding the missing --dhcp-hostsfile option. Both affected tests contain DHCP host elements but missed the necessary --dhcp-hostsfile option. 4) Rename networkSaveDnsmasqHostsfile to networkBuildDnsmasqHostsfile, because it doesn't save the dnsmasqContext anymore. 5) Move all directory creations in dnsmasq context handling code from the *New functions to dnsmasqSave to avoid directory creations in system paths in the test cases. 6) Now that networkBuildDnsmasqArgv doesn't create the dnsmasqContext anymore the test case can create one with the localstatedir that is expected by the tests instead of the configure --localstatedir given one. --- src/network/bridge_driver.c | 71 +++++++++----------- src/network/bridge_driver.h | 5 +- src/util/dnsmasq.c | 28 ++++---- src/util/dnsmasq.h | 1 + .../nat-network-dns-txt-record.argv | 3 +- tests/networkxml2argvdata/nat-network.argv | 3 +- tests/networkxml2argvtest.c | 8 ++- 7 files changed, 63 insertions(+), 56 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index aa170d6..f48fdcb 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -436,27 +436,17 @@ networkShutdown(void) { } -static dnsmasqContext* -networkSaveDnsmasqHostsfile(virNetworkIpDefPtr ipdef, - virNetworkDNSDefPtr dnsdef, - char *name, - bool force) +static int +networkBuildDnsmasqHostsfile(dnsmasqContext *dctx, + virNetworkIpDefPtr ipdef, + virNetworkDNSDefPtr dnsdef) { unsigned int i, j; - dnsmasqContext *dctx = dnsmasqContextNew(name, - DNSMASQ_STATE_DIR); - if (dctx == NULL) { - virReportOOMError(); - goto cleanup; - } - - if (!(! force && virFileExists(dctx->hostsfile->path))) { - for (i = 0; i < ipdef->nhosts; i++) { - virNetworkDHCPHostDefPtr host = &(ipdef->hosts[i]); - if ((host->mac) && VIR_SOCKET_HAS_ADDR(&host->ip)) - dnsmasqAddDhcpHost(dctx, host->mac, &host->ip, host->name); - } + for (i = 0; i < ipdef->nhosts; i++) { + virNetworkDHCPHostDefPtr host = &(ipdef->hosts[i]); + if ((host->mac) && VIR_SOCKET_HAS_ADDR(&host->ip)) + dnsmasqAddDhcpHost(dctx, host->mac, &host->ip, host->name); } if (dnsdef) { @@ -469,15 +459,7 @@ networkSaveDnsmasqHostsfile(virNetworkIpDefPtr ipdef, } } - if (dnsmasqSave(dctx) < 0) - goto cleanup; - - return dctx; - -cleanup: - dnsmasqContextFree(dctx); - - return NULL; + return 0; } @@ -485,12 +467,13 @@ static int networkBuildDnsmasqArgv(virNetworkObjPtr network, virNetworkIpDefPtr ipdef, const char *pidfile, - virCommandPtr cmd) { + virCommandPtr cmd, + dnsmasqContext *dctx) +{ int r, ret = -1; int nbleases = 0; int ii; virNetworkIpDefPtr tmpipdef; - dnsmasqContext *dctx = NULL; /* * NB, be careful about syntax for dnsmasq options in long format. @@ -617,14 +600,13 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (ipdef->nranges || ipdef->nhosts) virCommandAddArg(cmd, "--dhcp-no-override"); - if ((dctx = networkSaveDnsmasqHostsfile(ipdef, network->def->dns, network->def->name, false))) { + if (networkBuildDnsmasqHostsfile(dctx, ipdef, network->def->dns) >= 0) { if (dctx->hostsfile->nhosts) virCommandAddArgPair(cmd, "--dhcp-hostsfile", dctx->hostsfile->path); if (dctx->addnhostsfile->nhosts) virCommandAddArgPair(cmd, "--addn-hosts", dctx->addnhostsfile->path); - dnsmasqContextFree(dctx); } if (ipdef->tftproot) { @@ -655,7 +637,7 @@ cleanup: int networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, virCommandPtr *cmdout, - char *pidfile) + char *pidfile, dnsmasqContext *dctx) { virCommandPtr cmd = NULL; int ret = -1, ii; @@ -684,7 +666,7 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, virCommandPtr *cmdou return 0; cmd = virCommandNew(DNSMASQ); - if (networkBuildDnsmasqArgv(network, ipdef, pidfile, cmd) < 0) { + if (networkBuildDnsmasqArgv(network, ipdef, pidfile, cmd, dctx) < 0) { goto cleanup; } @@ -704,6 +686,7 @@ networkStartDhcpDaemon(virNetworkObjPtr network) char *pidfile = NULL; int ret = -1; int err; + dnsmasqContext *dctx = NULL; if ((err = virFileMakePath(NETWORK_PID_DIR)) != 0) { virReportSystemError(err, @@ -730,8 +713,16 @@ networkStartDhcpDaemon(virNetworkObjPtr network) goto cleanup; } - ret = networkBuildDhcpDaemonCommandLine(network,&cmd, pidfile); - if (ret< 0) + dctx = dnsmasqContextNew(network->def->name, DNSMASQ_STATE_DIR); + if (dctx == NULL) + goto cleanup; + + ret = networkBuildDhcpDaemonCommandLine(network, &cmd, pidfile, dctx); + if (ret < 0) + goto cleanup; + + ret = dnsmasqSave(dctx); + if (ret < 0) goto cleanup; if (virCommandRun(cmd, NULL) < 0) @@ -753,6 +744,7 @@ networkStartDhcpDaemon(virNetworkObjPtr network) cleanup: VIR_FREE(pidfile); virCommandFree(cmd); + dnsmasqContextFree(dctx); return ret; } @@ -2205,6 +2197,7 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { virNetworkObjPtr network = NULL; virNetworkPtr ret = NULL; int ii; + dnsmasqContext* dctx = NULL; networkDriverLock(driver); @@ -2251,10 +2244,11 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { } } if (ipv4def) { - dnsmasqContext* dctx = networkSaveDnsmasqHostsfile(ipv4def, network->def->dns, network->def->name, true); - if (dctx == NULL) + dctx = dnsmasqContextNew(network->def->name, DNSMASQ_STATE_DIR); + if (dctx == NULL || + networkBuildDnsmasqHostsfile(dctx, ipv4def, network->def->dns) < 0 || + dnsmasqSave(dctx) < 0) goto cleanup; - dnsmasqContextFree(dctx); } VIR_INFO("Defining network '%s'", network->def->name); @@ -2262,6 +2256,7 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { cleanup: virNetworkDefFree(def); + dnsmasqContextFree(dctx); if (network) virNetworkObjUnlock(network); networkDriverUnlock(driver); diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index a106e3d..2896c84 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -30,9 +30,12 @@ # include "internal.h" # include "network_conf.h" # include "command.h" +# include "dnsmasq.h" int networkRegister(void); -int networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, virCommandPtr *cmdout, char *pidfile); +int networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, + virCommandPtr *cmdout, char *pidfile, + dnsmasqContext *dctx); typedef char *(*networkDnsmasqLeaseFileNameFunc)(const char *netname); diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index 04a912a..4bdbb44 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -142,7 +142,6 @@ static dnsmasqAddnHostsfile * addnhostsNew(const char *name, const char *config_dir) { - int err; dnsmasqAddnHostsfile *addnhostsfile; if (VIR_ALLOC(addnhostsfile) < 0) { @@ -159,12 +158,6 @@ addnhostsNew(const char *name, goto error; } - if ((err = virFileMakePath(config_dir))) { - virReportSystemError(err, _("cannot create config directory '%s'"), - config_dir); - goto error; - } - return addnhostsfile; error: @@ -344,7 +337,6 @@ static dnsmasqHostsfile * hostsfileNew(const char *name, const char *config_dir) { - int err; dnsmasqHostsfile *hostsfile; if (VIR_ALLOC(hostsfile) < 0) { @@ -361,12 +353,6 @@ hostsfileNew(const char *name, goto error; } - if ((err = virFileMakePath(config_dir))) { - virReportSystemError(err, _("cannot create config directory '%s'"), - config_dir); - goto error; - } - return hostsfile; error: @@ -468,6 +454,11 @@ dnsmasqContextNew(const char *network_name, return NULL; } + if (!(ctx->config_dir = strdup(config_dir))) { + virReportOOMError(); + goto error; + } + if (!(ctx->hostsfile = hostsfileNew(network_name, config_dir))) goto error; if (!(ctx->addnhostsfile = addnhostsNew(network_name, config_dir))) @@ -492,6 +483,8 @@ dnsmasqContextFree(dnsmasqContext *ctx) if (!ctx) return; + VIR_FREE(ctx->config_dir); + if (ctx->hostsfile) hostsfileFree(ctx->hostsfile); if (ctx->addnhostsfile) @@ -546,8 +539,15 @@ dnsmasqAddHost(dnsmasqContext *ctx, int dnsmasqSave(const dnsmasqContext *ctx) { + int err; int ret = 0; + if ((err = virFileMakePath(ctx->config_dir))) { + virReportSystemError(err, _("cannot create config directory '%s'"), + ctx->config_dir); + return -1; + } + if (ctx->hostsfile) ret = hostsfileSave(ctx->hostsfile); if (ret == 0) { diff --git a/src/util/dnsmasq.h b/src/util/dnsmasq.h index 3f6320a..62f6f38 100644 --- a/src/util/dnsmasq.h +++ b/src/util/dnsmasq.h @@ -60,6 +60,7 @@ typedef struct typedef struct { + char *config_dir; dnsmasqHostsfile *hostsfile; dnsmasqAddnHostsfile *addnhostsfile; } dnsmasqContext; diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index 9d74543..be6ba4b 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -5,4 +5,5 @@ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 --dhcp-no-override\ +--dhcp-lease-max=253 --dhcp-no-override \ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile\ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv index 181623f..d7faee2 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv @@ -4,4 +4,5 @@ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 --dhcp-no-override\ +--dhcp-lease-max=253 --dhcp-no-override \ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile\ diff --git a/tests/networkxml2argvtest.c b/tests/networkxml2argvtest.c index 62de191..4a11d6f 100644 --- a/tests/networkxml2argvtest.c +++ b/tests/networkxml2argvtest.c @@ -24,6 +24,7 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { virNetworkObjPtr obj = NULL; virCommandPtr cmd = NULL; char *pidfile = NULL; + dnsmasqContext *dctx = NULL; if (virtTestLoadFile(inxml, &inXmlData) < 0) goto fail; @@ -38,8 +39,12 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { goto fail; obj->def = dev; + dctx = dnsmasqContextNew(dev->name, "/var/lib/libvirt/dnsmasq"); - if (networkBuildDhcpDaemonCommandLine(obj, &cmd, pidfile) < 0) + if (dctx == NULL) + goto fail; + + if (networkBuildDhcpDaemonCommandLine(obj, &cmd, pidfile, dctx) < 0) goto fail; if (!(actual = virCommandToString(cmd))) @@ -59,6 +64,7 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { VIR_FREE(pidfile); virCommandFree(cmd); virNetworkObjFree(obj); + dnsmasqContextFree(dctx); return ret; } -- 1.7.0.4

3 3

[libvirt] [PATCH] Fix compliation with systemtap 1.3
by Matthias Bolte 29 Jun '11

29 Jun '11

Version 1.3 uses this macro #define STAP_CAST(t) (size_t)t that breaks if t is a function. For that to work it should probably look like this #define STAP_CAST(t) ((size_t)(t)) In systemtap 1.4 this was completely rewritten. Anyway, before commit df0b57a95a767c t was always a variable, but now also a function is used here, namely virNetSASLSessionGetIdentity. Use an intermediate variable to avoid this problem. --- daemon/remote.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 9547702..9e6cf77 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1759,13 +1759,13 @@ remoteSASLFinish(virNetServerClientPtr client) if (virNetServerClientSetIdentity(client, identity) < 0) goto error; - virNetServerClientSetSASLSession(client, priv->sasl); VIR_DEBUG("Authentication successful %d", virNetServerClientGetFD(client)); + + identity = virNetSASLSessionGetIdentity(priv->sasl); PROBE(CLIENT_AUTH_ALLOW, "fd=%d, auth=%d, username=%s", - virNetServerClientGetFD(client), REMOTE_AUTH_SASL, - virNetSASLSessionGetIdentity(priv->sasl)); + virNetServerClientGetFD(client), REMOTE_AUTH_SASL, identity); virNetSASLSessionFree(priv->sasl); priv->sasl = NULL; @@ -1793,6 +1793,7 @@ remoteDispatchAuthSaslStart(virNetServerPtr server ATTRIBUTE_UNUSED, int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); + const char *identity; virMutexLock(&priv->lock); @@ -1856,9 +1857,9 @@ authfail: goto error; authdeny: + identity = virNetSASLSessionGetIdentity(priv->sasl); PROBE(CLIENT_AUTH_DENY, "fd=%d, auth=%d, username=%s", - virNetServerClientGetFD(client), REMOTE_AUTH_SASL, - virNetSASLSessionGetIdentity(priv->sasl)); + virNetServerClientGetFD(client), REMOTE_AUTH_SASL, identity); goto error; error: @@ -1888,7 +1889,7 @@ remoteDispatchAuthSaslStep(virNetServerPtr server ATTRIBUTE_UNUSED, int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); - + const char *identity; virMutexLock(&priv->lock); @@ -1952,9 +1953,9 @@ authfail: goto error; authdeny: + identity = virNetSASLSessionGetIdentity(priv->sasl); PROBE(CLIENT_AUTH_DENY, "fd=%d, auth=%d, username=%s", - virNetServerClientGetFD(client), REMOTE_AUTH_SASL, - virNetSASLSessionGetIdentity(priv->sasl)); + virNetServerClientGetFD(client), REMOTE_AUTH_SASL, identity); goto error; error: -- 1.7.0.4

2 2

[libvirt] [PATCH] build: fix mingw build
by Eric Blake 28 Jun '11

28 Jun '11

./autobuild.sh died on several messages resembling: ../../src/rpc/virnetsocket.c: In function 'virNetSocketNewListenTCP': ../../src/rpc/virnetsocket.c:231:9: error: implicit declaration of function 'bind_used_without_requesting_gnulib_module_bind' [-Wimplicit-function-declaration] ../../src/rpc/virnetsocket.c:231:9: error: nested extern declaration of 'bind_used_without_requesting_gnulib_module_bind' [-Wnested-externs] Basically, gnulib socket fds are not safe to pass to mingw socket functions unless we pull in those gnulib modules. * bootstrap.conf (gnulib_modules): Add modules to handle socket functions on mingw. --- Pushing under the build-breaker rule. bootstrap.conf | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 7b2cd60..581d60b 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -19,8 +19,10 @@ # gnulib modules used by this package. gnulib_modules=' +accept areadlink base64 +bind byteswap c-ctype c-strcase @@ -40,6 +42,8 @@ getaddrinfo getcwd-lgpl gethostname getpass +getpeername +getsockname gettext-h gettimeofday gitlog-to-changelog @@ -48,6 +52,7 @@ ignore-value inet_pton intprops ioctl +listen maintainer-makefile manywarnings mkstemp -- 1.7.4.4

1 0

[libvirt] [PATCH] sysinfo: fix parsing regression
by Eric Blake 28 Jun '11

28 Jun '11

Detected by gcc -O2, introduced in commit 532ce9c2. If dmidecode outputs a field unrecognized by the parsers, then the code would dereference an uninitialized eol variable. * src/util/sysinfo.c (virSysinfoParseBIOS) (virSysinfoParseSystem, virSysinfoParseProcessor) (virSysinfoParseMemory): Avoid uninitialized variable. --- I'm pushing this under the build-breaker rule. It introduces a merge conflict with the (unapplied) patch here: https://www.redhat.com/archives/libvir-list/2011-June/msg01356.html but that patch needs to be rebased anyways. src/util/sysinfo.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index bff1cb8..d32f7f0 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -130,7 +130,7 @@ virSysinfoRead(void) { static char * virSysinfoParseBIOS(char *base, virSysinfoDefPtr ret) { - char *cur, *eol; + char *cur, *eol = NULL; if ((cur = strstr(base, "Vendor: ")) != NULL) { cur += 8; @@ -157,7 +157,7 @@ virSysinfoParseBIOS(char *base, virSysinfoDefPtr ret) goto no_memory; } - return eol + 1; + return eol ? eol + 1 : NULL; no_memory: return NULL; @@ -166,7 +166,7 @@ no_memory: static char * virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) { - char *cur, *eol; + char *cur, *eol = NULL; if ((base = strstr(base, "System Information")) == NULL) return 0; @@ -215,7 +215,7 @@ virSysinfoParseSystem(char *base, virSysinfoDefPtr ret) goto no_memory; } - return eol + 1; + return eol ? eol + 1 : NULL; no_memory: return NULL; @@ -229,6 +229,7 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) while((tmp_base = strstr(base, "Processor Information")) != NULL) { base = tmp_base; + eol = NULL; if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) { goto no_memory; @@ -313,6 +314,8 @@ virSysinfoParseProcessor(char *base, virSysinfoDefPtr ret) goto no_memory; } + if (!eol) + break; base = eol + 1; } @@ -330,6 +333,7 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) while ((tmp_base = strstr(base, "Memory Device")) != NULL) { base = tmp_base; + eol = NULL; if (VIR_EXPAND_N(ret->memory, ret->nmemory, 1) < 0) { goto no_memory; @@ -411,6 +415,8 @@ virSysinfoParseMemory(char *base, virSysinfoDefPtr ret) } next: + if (!eol) + break; base = eol + 1; } -- 1.7.4.4

1 0

[libvirt] [PATCH] build: Don't expect translatable strings in a dead file
by Jiri Denemark 28 Jun '11

28 Jun '11

daemon/remote_dispatch_bodies.h is no longer with us and shouldn't be searched for translatable strings. --- Pushed under the build-breaker rule. po/POTFILES.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index a81fc55..1f226fd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,5 @@ daemon/libvirtd.c daemon/remote.c -daemon/remote_dispatch_bodies.h daemon/stream.c gnulib/lib/gai_strerror.c src/conf/cpu_conf.c -- 1.7.6

2 1

[libvirt] [PATCH] daemon: Fix build without polkit
by Jiri Denemark 28 Jun '11

28 Jun '11

--- Pushed under the build-breaker rule. daemon/libvirtd.c | 10 +++++----- daemon/remote.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 62f089d..d1f80e4 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -874,7 +874,7 @@ static void daemonConfigFree(struct daemonConfig *data); static struct daemonConfig* -daemonConfigNew(bool privileged) +daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) { struct daemonConfig *data; char *localhost; @@ -1034,8 +1034,10 @@ daemonConfigLoad(struct daemonConfig *data, */ if (data->auth_unix_rw == REMOTE_AUTH_POLKIT) { VIR_FREE(data->unix_sock_rw_perms); - if (!(data->unix_sock_rw_perms = strdup("0777"))) - goto no_memory; + if (!(data->unix_sock_rw_perms = strdup("0777"))) { + virReportOOMError(); + goto error; + } } #endif if (remoteConfigGetAuth(conf, "auth_unix_ro", &data->auth_unix_ro, filename) < 0) @@ -1091,8 +1093,6 @@ daemonConfigLoad(struct daemonConfig *data, virConfFree (conf); return 0; -no_memory: - virReportOOMError(); error: virConfFree (conf); return -1; diff --git a/daemon/remote.c b/daemon/remote.c index 47e47e4..9547702 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2209,7 +2209,7 @@ authdeny: static int remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, + virNetServerClientPtr client ATTRIBUTE_UNUSED, virNetMessageHeaderPtr hdr ATTRIBUTE_UNUSED, virNetMessageErrorPtr rerr, remote_auth_polkit_ret *ret ATTRIBUTE_UNUSED) -- 1.7.6

1 0

[libvirt] [PATCH] remote: fix uninitialized variable
by Eric Blake 28 Jun '11

28 Jun '11

Detected by gcc -O2: remote/remote_driver.c: In function 'doRemoteOpen': remote/remote_driver.c:2753:26: error: 'sasl' may be used uninitialized in this function [-Werror=uninitialized] * src/remote/remote_driver.c (remoteAuthSASL): Initialize sasl. --- Pushing under the build-breaker rule. src/remote/remote_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 2ac87c8..0e68bc5 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2520,7 +2520,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int ret = -1; const char *mechlist; virNetSASLContextPtr saslCtxt; - virNetSASLSessionPtr sasl; + virNetSASLSessionPtr sasl = NULL; VIR_DEBUG("Client initialize SASL authentication"); -- 1.7.4.4

1 0

[libvirt] [PATCH] build: fix 'make check' when pdwtags is available
by Eric Blake 28 Jun '11

28 Jun '11

Problem introduced in commit 6818cf86. * src/remote_protocol-structs: Delete unused struct. --- Pushing under the build-breaker rule. Normally, deleting a struct from remote_protocol-structs is a sign of an over-the-wire API breakage; but in this case, I've verified that the new RPC code manages to represent the same over-the-wire layout without needing this header struct. src/remote_protocol-structs | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index c07ba81..25979b4 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1615,11 +1615,3 @@ struct remote_domain_get_control_info_ret { u_int details; uint64_t stateTime; }; -struct remote_message_header { - u_int prog; - u_int vers; - int proc; - remote_message_type type; - u_int serial; - remote_message_status status; -}; -- 1.7.4.4

1 0

[libvirt] [PATCH 0/3] Improve flexibility of SELinux labelling
by Daniel P. Berrange 28 Jun '11

28 Jun '11

This patch series adds two new features - The ability to override 'system_u:system_r:svirt_t:s0' from /etc/selinux/targeted/contexts/virtual_domain_context using the guest XML - The ability to use dynamic relabelling of resources, in combo with static VM label assignment. The latter is useful for management applications which want to be in full control of assigning VM labels (so that they can be unique across an entire cluster of hosts for example), while still benefiting from automatic relabelling of resources in the XML.

3 10

[libvirt] [PATCH 0/4 v2] Automatic lease management for sanlock
by Daniel P. Berrange 28 Jun '11

28 Jun '11

This is an update to http://www.redhat.com/archives/libvir-list/2011-June/msg00813.html Changed in this v2 posting - Incorporated feedback from v1 - Removed the cron job. This should be manually setup by the admin on only one host - Added documentation to the website on how to deploy sanlock

2 11

[libvirt] [PATCH] network: add domain to unqalified names define with <host>
by Laine Stump 28 Jun '11

28 Jun '11

If a domain name is defined for a network, add the --expand-hosts option to the dnsmasq commandline. This results in the domain being added to any hostname that is defined in a dns <host> element and contains no '.' characters (i.e. it is an "unqualified" hostname). Since PTR records are automatically created for any name define in <host>, the result of a PTR request will change from the unqualified name to the qualified name. This also has the same effect on any hostnames that dnsmasq reads from the host's /etc/hosts file. Hosts. I want to make sure that everyone notices that previous paragraph and has a chance to object if they believe this change in existing behavior will be detrimental. Note that guests will still be able to query the unqualified name, with the same results as before; it is only when a reverse lookup of an IP address is done that the result will be different, e.g. it will return "f15.example.com" instead of "f15". (In the case of guest hostnames that were learned by dnsmasq via DHCP requests, they were already getting the domain name added on, even without --expand-hosts). --- src/network/bridge_driver.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f15a7a6..a9a0374 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -614,6 +614,10 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (ipdef->nranges || ipdef->nhosts) virCommandAddArg(cmd, "--dhcp-no-override"); + /* add domain to any non-qualified hostnames in /etc/hosts or addn-hosts file */ + if (network->def->domain) + virCommandAddArg(cmd, "--expand-hosts"); + if ((dctx = networkSaveDnsmasqHostsfile(ipdef, network->def->dns, network->def->name, false))) { if (dctx->hostsfile->nhosts) virCommandAddArgPair(cmd, "--dhcp-hostsfile", -- 1.7.3.4

2 2

[libvirt] [PATCH 0/4] Switch over to use the new RPC code
by Daniel P. Berrange 28 Jun '11

28 Jun '11

This patch set actually switches the libvirtd daemon and remote driver client code to use the new RPC code. While it has had a fair amount of testing, it has also been rebased many many many times. There are bound to be things in it which break, hopefully not the actual RPC wire data format, but in the client/daemon dispatch code and thread safety, etc ....

3 16

[libvirt] [PATCH 0/8 v2] Enable libvirt to attach to existing QEMU instances
by Daniel P. Berrange 28 Jun '11

28 Jun '11

An update of http://www.redhat.com/archives/libvir-list/2011-May/msg00223.html New in this series: - Split the patch up into more pieces for easier review - Add tainting of the attached process - Correctly handle removal of pidfile for attachde process - Wire up PCI address detection - Add virsh documentation

2 10

[libvirt] [PATCH] Add node prefix to virNodeGet(CPU|Memory)Stats structs and defines
by Matthias Bolte 28 Jun '11

28 Jun '11

--- daemon/remote.c | 4 +- include/libvirt/libvirt.h.in | 99 ++++++++++++++++++++---------------------- src/driver.h | 4 +- src/libvirt.c | 38 ++++++++-------- src/nodeinfo.c | 40 ++++++++-------- src/nodeinfo.h | 4 +- src/remote/remote_driver.c | 4 +- tools/virsh.c | 18 ++++---- 8 files changed, 103 insertions(+), 108 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 1914b25..180fefa 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1557,7 +1557,7 @@ remoteDispatchNodeGetCPUStats (struct qemud_server *server ATTRIBUTE_UNUSED, remote_node_get_cpu_stats_args *args, remote_node_get_cpu_stats_ret *ret) { - virCPUStatsPtr params = NULL; + virNodeCPUStatsPtr params = NULL; int i; int cpuNum = args->cpuNum; int nparams = args->nparams; @@ -1634,7 +1634,7 @@ remoteDispatchNodeGetMemoryStats (struct qemud_server *server ATTRIBUTE_UNUSED, remote_node_get_memory_stats_args *args, remote_node_get_memory_stats_ret *ret) { - virMemoryStatsPtr params = NULL; + virNodeMemoryStatsPtr params = NULL; int i; int cellNum = args->cellNum; int nparams = args->nparams; diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index cf1a682..f029d69 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -302,135 +302,130 @@ struct _virNodeInfo { }; /** - * VIR_CPU_STATS_FIELD_LENGTH: + * VIR_NODE_CPU_STATS_FIELD_LENGTH: * * Macro providing the field length of virNodeCPUStats */ -#define VIR_CPU_STATS_FIELD_LENGTH 80 +#define VIR_NODE_CPU_STATS_FIELD_LENGTH 80 /** - * VIR_CPU_STATS_ALL_CPUS: + * VIR_NODE_CPU_STATS_ALL_CPUS: * * Macro for the total CPU time/utilization */ -#define VIR_CPU_STATS_ALL_CPUS (-1) +#define VIR_NODE_CPU_STATS_ALL_CPUS (-1) /** - * VIR_CPU_STATS_KERNEL: + * VIR_NODE_CPU_STATS_KERNEL: * * Macro for the cumulative CPU time which was spend by kernel, * since the node booting up (in nanoseconds). */ -#define VIR_CPU_STATS_KERNEL "kernel" +#define VIR_NODE_CPU_STATS_KERNEL "kernel" /** - * VIR_CPU_STATS_USER: + * VIR_NODE_CPU_STATS_USER: * * The cumulative CPU time which was spend by user processes, * since the node booting up (in nanoseconds). */ -#define VIR_CPU_STATS_USER "user" +#define VIR_NODE_CPU_STATS_USER "user" /** - * VIR_CPU_STATS_IDLE: + * VIR_NODE_CPU_STATS_IDLE: * * The cumulative idle CPU time, * since the node booting up (in nanoseconds). */ -#define VIR_CPU_STATS_IDLE "idle" +#define VIR_NODE_CPU_STATS_IDLE "idle" /** - * VIR_CPU_STATS_IOWAIT: + * VIR_NODE_CPU_STATS_IOWAIT: * * The cumulative I/O wait CPU time, * since the node booting up (in nanoseconds). */ -#define VIR_CPU_STATS_IOWAIT "iowait" +#define VIR_NODE_CPU_STATS_IOWAIT "iowait" /** - * VIR_CPU_STATS_UTILIZATION: + * VIR_NODE_CPU_STATS_UTILIZATION: * * The CPU utilization of a node. * The usage value is in percent and 100% represents all CPUs of * the node. */ -#define VIR_CPU_STATS_UTILIZATION "utilization" +#define VIR_NODE_CPU_STATS_UTILIZATION "utilization" /** - * virCPUStats: + * virNodeCPUStats: * * a virNodeCPUStats is a structure filled by virNodeGetCPUStats() * providing information about the CPU stats of the node. */ -typedef struct _virCPUStats virCPUStats; +typedef struct _virNodeCPUStats virNodeCPUStats; -struct _virCPUStats { - char field[VIR_CPU_STATS_FIELD_LENGTH]; +struct _virNodeCPUStats { + char field[VIR_NODE_CPU_STATS_FIELD_LENGTH]; unsigned long long value; }; /** - * VIR_MEMORY_STATS_FIELD_LENGTH: + * VIR_NODE_MEMORY_STATS_FIELD_LENGTH: * - * Macro providing the field length of virMemoryStats + * Macro providing the field length of virNodeMemoryStats */ -#define VIR_MEMORY_STATS_FIELD_LENGTH 80 +#define VIR_NODE_MEMORY_STATS_FIELD_LENGTH 80 /** - * VIR_MEMORY_STATS_ALL_CELLS: + * VIR_NODE_MEMORY_STATS_ALL_CELLS: * * Macro for the total memory of all cells. */ -#define VIR_MEMORY_STATS_ALL_CELLS (-1) +#define VIR_NODE_MEMORY_STATS_ALL_CELLS (-1) /** - * VIR_MEMORY_STATS_TOTAL: + * VIR_NODE_MEMORY_STATS_TOTAL: * * Macro for the total memory of specified cell: * it represents the maximum memory. */ - -#define VIR_MEMORY_STATS_TOTAL "total" +#define VIR_NODE_MEMORY_STATS_TOTAL "total" /** - * VIR_MEMORY_STATS_FREE: + * VIR_NODE_MEMORY_STATS_FREE: * * Macro for the free memory of specified cell: * On Linux, it includes buffer and cached memory, in case of - * VIR_MEMORY_STATS_ALL_CELLS. + * VIR_NODE_MEMORY_STATS_ALL_CELLS. */ - -#define VIR_MEMORY_STATS_FREE "free" +#define VIR_NODE_MEMORY_STATS_FREE "free" /** - * VIR_MEMORY_STATS_BUFFERS: + * VIR_NODE_MEMORY_STATS_BUFFERS: * * Macro for the buffer memory: On Linux, it is only returned in case of - * VIR_MEMORY_STATS_ALL_CELLS. + * VIR_NODE_MEMORY_STATS_ALL_CELLS. */ - -#define VIR_MEMORY_STATS_BUFFERS "buffers" +#define VIR_NODE_MEMORY_STATS_BUFFERS "buffers" /** - * VIR_MEMORY_STATS_CACHED: + * VIR_NODE_MEMORY_STATS_CACHED: * * Macro for the cached memory: On Linux, it is only returned in case of - * VIR_MEMORY_STATS_ALL_CELLS. + * VIR_NODE_MEMORY_STATS_ALL_CELLS. */ - -#define VIR_MEMORY_STATS_CACHED "cached" +#define VIR_NODE_MEMORY_STATS_CACHED "cached" /** - * virMemoryStats: + * virNodeMemoryStats: * - * a virMemoryStats is a structure filled by virNodeGetMemoryStats() + * a virNodeMemoryStats is a structure filled by virNodeGetMemoryStats() * providing information about the memory of the node. */ +typedef struct _virNodeMemoryStats virNodeMemoryStats; -typedef struct _virMemoryStats virMemoryStats; - -struct _virMemoryStats { - char field[VIR_MEMORY_STATS_FIELD_LENGTH]; +struct _virNodeMemoryStats { + char field[VIR_NODE_MEMORY_STATS_FIELD_LENGTH]; unsigned long long value; }; @@ -693,20 +688,20 @@ int virDomainMigrateSetMaxSpeed(virDomainPtr domain, typedef virNodeInfo *virNodeInfoPtr; /** - * virCPUStatsPtr: + * virNodeCPUStatsPtr: * - * a virCPUStatsPtr is a pointer to a virCPUStats structure. + * a virNodeCPUStatsPtr is a pointer to a virNodeCPUStats structure. */ -typedef virCPUStats *virCPUStatsPtr; +typedef virNodeCPUStats *virNodeCPUStatsPtr; /** - * virMemoryStatsPtr: + * virNodeMemoryStatsPtr: * - * a virMemoryStatsPtr is a pointer to a virMemoryStats structure. + * a virNodeMemoryStatsPtr is a pointer to a virNodeMemoryStats structure. */ -typedef virMemoryStats *virMemoryStatsPtr; +typedef virNodeMemoryStats *virNodeMemoryStatsPtr; /** * virConnectFlags @@ -844,13 +839,13 @@ char * virConnectGetCapabilities (virConnectPtr conn); int virNodeGetCPUStats (virConnectPtr conn, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags); int virNodeGetMemoryStats (virConnectPtr conn, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags); diff --git a/src/driver.h b/src/driver.h index d45575a..5fd2433 100644 --- a/src/driver.h +++ b/src/driver.h @@ -380,7 +380,7 @@ typedef int (*virDrvNodeGetCPUStats) (virConnectPtr conn, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags); @@ -388,7 +388,7 @@ typedef int (*virDrvNodeGetMemoryStats) (virConnectPtr conn, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags); diff --git a/src/libvirt.c b/src/libvirt.c index 36a90d1..1f4730d 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5287,7 +5287,7 @@ error: /** * virNodeGetCPUStats: * @conn: pointer to the hypervisor connection. - * @cpuNum: number of node cpu. (VIR_CPU_STATS_ALL_CPUS means total cpu + * @cpuNum: number of node cpu. (VIR_NODE_CPU_STATS_ALL_CPUS means total cpu * statistics) * @params: pointer to node cpu time parameter objects * @nparams: number of node cpu time parameter (this value should be same or @@ -5296,23 +5296,23 @@ error: * * This function provides individual cpu statistics of the node. * If you want to get total cpu statistics of the node, you must specify - * VIR_CPU_STATS_ALL_CPUS to @cpuNum. + * VIR_NODE_CPU_STATS_ALL_CPUS to @cpuNum. * The @params array will be filled with the values equal to the number of * parameters suggested by @nparams * * As the value of @nparams is dynamic, call the API setting @nparams to 0 and * @params as NULL, the API returns the number of parameters supported by the * HV by updating @nparams on SUCCESS. The caller should then allocate @params - * array, i.e. (sizeof(@virCPUStats) * @nparams) bytes and call + * array, i.e. (sizeof(@virNodeCPUStats) * @nparams) bytes and call * the API again. * * Here is a sample code snippet: * * if ((virNodeGetCPUStats(conn, cpuNum, NULL, &nparams, 0) == 0) && * (nparams != 0)) { - * if ((params = malloc(sizeof(virCPUStats) * nparams)) == NULL) + * if ((params = malloc(sizeof(virNodeCPUStats) * nparams)) == NULL) * goto error; - * memset(params, 0, sizeof(virCPUStats) * nparams); + * memset(params, 0, sizeof(virNodeCPUStats) * nparams); * if (virNodeGetCPUStats(conn, cpuNum, params, &nparams, 0)) * goto error; * } @@ -5340,7 +5340,7 @@ error: */ int virNodeGetCPUStats (virConnectPtr conn, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags) { VIR_DEBUG("conn=%p, cpuNum=%d, params=%p, nparams=%d, flags=%u", @@ -5355,7 +5355,7 @@ int virNodeGetCPUStats (virConnectPtr conn, } if ((nparams == NULL) || (*nparams < 0) || - ((cpuNum < 0) && (cpuNum != VIR_CPU_STATS_ALL_CPUS))) { + ((cpuNum < 0) && (cpuNum != VIR_NODE_CPU_STATS_ALL_CPUS))) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } @@ -5377,8 +5377,8 @@ error: /** * virNodeGetMemoryStats: * @conn: pointer to the hypervisor connection. - * @cellNum: number of node cell. (VIR_MEMORY_STATS_ALL_CELLS means total cell - * statistics) + * @cellNum: number of node cell. (VIR_NODE_MEMORY_STATS_ALL_CELLS means total + * cell statistics) * @params: pointer to node memory stats objects * @nparams: number of node memory stats (this value should be same or * less than the number of stats supported) @@ -5386,23 +5386,23 @@ error: * * This function provides memory stats of the node. * If you want to get total cpu statistics of the node, you must specify - * VIR_MEMORY_STATS_ALL_CELLS to @cellNum. + * VIR_NODE_MEMORY_STATS_ALL_CELLS to @cellNum. * The @params array will be filled with the values equal to the number of * stats suggested by @nparams * * As the value of @nparams is dynamic, call the API setting @nparams to 0 and * @params as NULL, the API returns the number of parameters supported by the * HV by updating @nparams on SUCCESS. The caller should then allocate @params - * array, i.e. (sizeof(@virMemoryStats) * @nparams) bytes and call + * array, i.e. (sizeof(@virNodeMemoryStats) * @nparams) bytes and call * the API again. * * Here is the sample code snippet: * * if ((virNodeGetMemoryStats(conn, cellNum, NULL, &nparams, 0) == 0) && * (nparams != 0)) { - * if ((params = malloc(sizeof(virMemoryStats) * nparams)) == NULL) + * if ((params = malloc(sizeof(virNodeMemoryStats) * nparams)) == NULL) * goto error; - * memset(params, cellNum, 0, sizeof(virMemoryStats) * nparams); + * memset(params, cellNum, 0, sizeof(virNodeMemoryStats) * nparams); * if (virNodeGetMemoryStats(conn, params, &nparams, 0)) * goto error; * } @@ -5412,21 +5412,21 @@ error: * * Memory Stats: * - * VIR_MEMORY_STATS_TOTAL: + * VIR_NODE_MEMORY_STATS_TOTAL: * The total memory usage.(KB) - * VIR_MEMORY_STATS_FREE: + * VIR_NODE_MEMORY_STATS_FREE: * The free memory usage.(KB) * On linux, this usage includes buffers and cached. - * VIR_MEMORY_STATS_BUFFERS: + * VIR_NODE_MEMORY_STATS_BUFFERS: * The buffers memory usage.(KB) - * VIR_MEMORY_STATS_CACHED: + * VIR_NODE_MEMORY_STATS_CACHED: * The cached memory usage.(KB) * * Returns -1 in case of error, 0 in case of success. */ int virNodeGetMemoryStats (virConnectPtr conn, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags) { VIR_DEBUG("conn=%p, cellNum=%d, params=%p, nparams=%d, flags=%u", @@ -5441,7 +5441,7 @@ int virNodeGetMemoryStats (virConnectPtr conn, } if ((nparams == NULL) || (*nparams < 0) || - ((cellNum < 0) && (cellNum != VIR_MEMORY_STATS_ALL_CELLS))) { + ((cellNum < 0) && (cellNum != VIR_NODE_MEMORY_STATS_ALL_CELLS))) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } diff --git a/src/nodeinfo.c b/src/nodeinfo.c index cb2f805..4620d93 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -72,11 +72,11 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, static int linuxNodeGetCPUStats(FILE *procstat, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams); static int linuxNodeGetMemoryStats(FILE *meminfo, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams); /* Return the positive decimal contents of the given @@ -396,7 +396,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, int linuxNodeGetCPUStats(FILE *procstat, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams) { int ret = -1; @@ -418,7 +418,7 @@ int linuxNodeGetCPUStats(FILE *procstat, goto cleanup; } - if (cpuNum == VIR_CPU_STATS_ALL_CPUS) { + if (cpuNum == VIR_NODE_CPU_STATS_ALL_CPUS) { strcpy(cpu_header, "cpu"); } else { snprintf(cpu_header, sizeof(cpu_header), "cpu%d", cpuNum); @@ -439,11 +439,11 @@ int linuxNodeGetCPUStats(FILE *procstat, } for (i = 0; i < *nparams; i++) { - virCPUStatsPtr param = &params[i]; + virNodeCPUStatsPtr param = &params[i]; switch (i) { case 0: /* fill kernel cpu time here */ - if (virStrcpyStatic(param->field, VIR_CPU_STATS_KERNEL) == NULL) { + if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_KERNEL) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel cpu time too long for destination")); goto cleanup; @@ -452,7 +452,7 @@ int linuxNodeGetCPUStats(FILE *procstat, break; case 1: /* fill user cpu time here */ - if (virStrcpyStatic(param->field, VIR_CPU_STATS_USER) == NULL) { + if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_USER) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel cpu time too long for destination")); goto cleanup; @@ -461,7 +461,7 @@ int linuxNodeGetCPUStats(FILE *procstat, break; case 2: /* fill idle cpu time here */ - if (virStrcpyStatic(param->field, VIR_CPU_STATS_IDLE) == NULL) { + if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_IDLE) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel cpu time too long for destination")); goto cleanup; @@ -470,7 +470,7 @@ int linuxNodeGetCPUStats(FILE *procstat, break; case 3: /* fill iowait cpu time here */ - if (virStrcpyStatic(param->field, VIR_CPU_STATS_IOWAIT) == NULL) { + if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_IOWAIT) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Field kernel cpu time too long for destination")); goto cleanup; @@ -496,7 +496,7 @@ cleanup: int linuxNodeGetMemoryStats(FILE *meminfo, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams) { int ret = -1; @@ -504,20 +504,20 @@ int linuxNodeGetMemoryStats(FILE *meminfo, int found = 0; int nr_param; char line[1024]; - char meminfo_hdr[VIR_MEMORY_STATS_FIELD_LENGTH]; + char meminfo_hdr[VIR_NODE_MEMORY_STATS_FIELD_LENGTH]; unsigned long val; struct field_conv { const char *meminfo_hdr; // meminfo header const char *field; // MemoryStats field name } field_conv[] = { - {"MemTotal:", VIR_MEMORY_STATS_TOTAL}, - {"MemFree:", VIR_MEMORY_STATS_FREE}, - {"Buffers:", VIR_MEMORY_STATS_BUFFERS}, - {"Cached:", VIR_MEMORY_STATS_CACHED}, + {"MemTotal:", VIR_NODE_MEMORY_STATS_TOTAL}, + {"MemFree:", VIR_NODE_MEMORY_STATS_FREE}, + {"Buffers:", VIR_NODE_MEMORY_STATS_BUFFERS}, + {"Cached:", VIR_NODE_MEMORY_STATS_CACHED}, {NULL, NULL} }; - if (cellNum == VIR_MEMORY_STATS_ALL_CELLS) { + if (cellNum == VIR_NODE_MEMORY_STATS_ALL_CELLS) { nr_param = LINUX_NB_MEMORY_STATS_ALL; } else { nr_param = LINUX_NB_MEMORY_STATS_CELL; @@ -570,7 +570,7 @@ int linuxNodeGetMemoryStats(FILE *meminfo, struct field_conv *convp = &field_conv[j]; if (STREQ(meminfo_hdr, convp->meminfo_hdr)) { - virMemoryStatsPtr param = &params[k++]; + virNodeMemoryStatsPtr param = &params[k++]; if (virStrcpyStatic(param->field, convp->field) == NULL) { nodeReportError(VIR_ERR_INTERNAL_ERROR, @@ -637,7 +637,7 @@ int nodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, virNodeInfoPtr nodeinfo) { int nodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags) { @@ -666,7 +666,7 @@ int nodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags) { @@ -678,7 +678,7 @@ int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, char *meminfo_path = NULL; FILE *meminfo; - if (cellNum == VIR_MEMORY_STATS_ALL_CELLS) { + if (cellNum == VIR_NODE_MEMORY_STATS_ALL_CELLS) { meminfo_path = strdup(MEMINFO_PATH); if (!meminfo_path) { virReportOOMError(); diff --git a/src/nodeinfo.h b/src/nodeinfo.h index 1ebcdb1..9b2658f 100644 --- a/src/nodeinfo.h +++ b/src/nodeinfo.h @@ -32,12 +32,12 @@ int nodeCapsInitNUMA(virCapsPtr caps); int nodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, int cpuNum, - virCPUStatsPtr params, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags ATTRIBUTE_UNUSED); int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, int cellNum, - virMemoryStatsPtr params, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags ATTRIBUTE_UNUSED); int nodeGetCellsFreeMemory(virConnectPtr conn, diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index f4b43e0..6b74bb5 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1699,7 +1699,7 @@ done: static int remoteNodeGetCPUStats (virConnectPtr conn, int cpuNum, - virCPUStatsPtr params, int *nparams, + virNodeCPUStatsPtr params, int *nparams, unsigned int flags) { int rv = -1; @@ -1765,7 +1765,7 @@ done: static int remoteNodeGetMemoryStats (virConnectPtr conn, int cellNum, - virMemoryStatsPtr params, int *nparams, + virNodeMemoryStatsPtr params, int *nparams, unsigned int flags) { int rv = -1; diff --git a/tools/virsh.c b/tools/virsh.c index 19db058..43b4bd3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3734,8 +3734,8 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) int i, j; bool flag_utilization = false; bool flag_percent = vshCommandOptBool(cmd, "percent"); - int cpuNum = VIR_CPU_STATS_ALL_CPUS; - virCPUStatsPtr params; + int cpuNum = VIR_NODE_CPU_STATS_ALL_CPUS; + virNodeCPUStatsPtr params; int nparams = 0; bool ret = false; struct cpu_stats { @@ -3779,15 +3779,15 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) for (j = 0; j < nparams; j++) { unsigned long long value = params[j].value; - if (STREQ(params[j].field, VIR_CPU_STATS_KERNEL)) { + if (STREQ(params[j].field, VIR_NODE_CPU_STATS_KERNEL)) { cpu_stats[i].sys = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_USER)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_USER)) { cpu_stats[i].user = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_IDLE)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_IDLE)) { cpu_stats[i].idle = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_IOWAIT)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_IOWAIT)) { cpu_stats[i].iowait = value; - } else if (STREQ(params[j].field, VIR_CPU_STATS_UTILIZATION)) { + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_UTILIZATION)) { cpu_stats[i].util = value; flag_utilization = true; } @@ -3861,8 +3861,8 @@ cmdNodeMemStats(vshControl *ctl, const vshCmd *cmd) { int nparams = 0; unsigned int i = 0; - int cellNum = VIR_MEMORY_STATS_ALL_CELLS; - virMemoryStatsPtr params = NULL; + int cellNum = VIR_NODE_MEMORY_STATS_ALL_CELLS; + virNodeMemoryStatsPtr params = NULL; bool ret = false; if (!vshConnectionUsability(ctl, ctl->conn)) -- 1.7.0.4

3 4

[libvirt] [PATCH] qemu: Fix update device for CURRENT + FORCE flags
by Jiri Denemark 28 Jun '11

28 Jun '11

When CURRENT and FORCE flags were used together, UpdateDeviceFlags did nothing because it failed to transform CURRENT into either LIVE or CONFIG. --- src/qemu/qemu_driver.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index da612e7..8596b30 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4789,12 +4789,15 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, virDomainDeviceDefPtr dev = NULL; bool force = (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) != 0; int ret = -1; + unsigned int affect; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | (action == QEMU_DEVICE_UPDATE ? VIR_DOMAIN_DEVICE_MODIFY_FORCE : 0), -1); + affect = flags & (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG); + qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); if (!vm) { @@ -4809,10 +4812,10 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, goto cleanup; if (virDomainObjIsActive(vm)) { - if (flags == VIR_DOMAIN_AFFECT_CURRENT) + if (affect == VIR_DOMAIN_AFFECT_CURRENT) flags |= VIR_DOMAIN_AFFECT_LIVE; } else { - if (flags == VIR_DOMAIN_AFFECT_CURRENT) + if (affect == VIR_DOMAIN_AFFECT_CURRENT) flags |= VIR_DOMAIN_AFFECT_CONFIG; /* check consistency between flags and the vm state */ if (flags & VIR_DOMAIN_AFFECT_LIVE) { -- 1.7.5.3

2 2

[libvirt] regression in finding boot device
by Laine Stump 28 Jun '11

28 Jun '11

I just built a fresh libvirt rpm from the head of git on my Fedora 14 machine and updated all the libvirt packages (I'm not sure what version had been running previously, but it was at least 0.8.8-4 from virt-preview, probably something later built from source). Just prior to the update, I had successfully started up a Fedora 15 guest and stopped it. After the update, I started the F15 guest and got the following message on the virt-viewer console: Booting from Hard Disk... Boot failed: could not read the boot disk. I downgraded to 0.8.8-4 from virt-preview, and was once again able to boot the guest. Upgraded again, still broken. Investigated some more, and I found that if I disable QEMU_CAPS_BOOTINDEX in the new libvirt, the guest boots with no problem. (bootindex was showing up as "1" in the log; not knowing anything about how it worked, I decided to try just changing it to "0". That didn't work. Switching back to the old method *did* work, though.) This system is running qemu-kvm-0.14-7.fc14.x86_64. If you'd like a look at the domain XML, the qemu logs, or access to the machine, just let me know.

2 3

[libvirt] [PATCH] xml: create an RNG file for common types and move some definitions there
by Laine Stump 28 Jun '11

28 Jun '11

domain.rng, network.rng, and interface.rng already use a few of the same types (or in some cases *should* but don't), and an upcoming code change will have them sharing even more. To prepare for that, this patch takes those common data type definitions and moves them into basictypes.rng. This may break some rule about the need to RNG files to be autonomous or something, but I saw that storageencryption.rng is used in this way, so I figured it must not be completely against the law... --- docs/schemas/basictypes.rng | 130 +++++++++++++++++++++++++++++++++++++++++++ docs/schemas/domain.rng | 86 +--------------------------- docs/schemas/interface.rng | 71 ++++------------------- docs/schemas/network.rng | 79 +++++++------------------- 4 files changed, 166 insertions(+), 200 deletions(-) create mode 100644 docs/schemas/basictypes.rng diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng new file mode 100644 index 0000000..b3267f5 --- /dev/null +++ b/docs/schemas/basictypes.rng @@ -0,0 +1,130 @@ +<?xml version="1.0"?> + +<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> + +  + <define name="unsignedInt"> + <data type="unsignedInt"> + <param name="pattern">[0-9]+</param> + </data> + </define> + + <define name="positiveInteger"> + <data type="positiveInteger"> + <param name="pattern">[0-9]+</param> + </data> + </define> + + <define name="uint8range"> + <choice> + <data type="string"> + <param name="pattern">0x[0-9a-fA-F]{1,2}</param> + </data> + <data type="int"> + <param name="minInclusive">0</param> + <param name="maxInclusive">255</param> + </data> + </choice> + </define> + <define name="uint24range"> + <choice> + <data type="string"> + <param name="pattern">0x[0-9a-fA-F]{1,6}</param> + </data> + <data type="int"> + <param name="minInclusive">0</param> + <param name="maxInclusive">16777215</param> + </data> + </choice> + </define> + + <define name="UUID"> + <choice> + <data type="string"> + <param name="pattern">[a-fA-F0-9]{32}</param> + </data> + <data type="string"> + <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param> + </data> + </choice> + </define> + +  + <define name="macAddr"> + <data type="string"> + <param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param> + </data> + </define> + +  + <define name="ipv4Addr"> + <data type="string"> + <param name="pattern">(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))</param> + </data> + </define> + +  + <define name="ipv6Addr"> + <data type="string"> +  +<param name="pattern">(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|(([0-9A-Fa-f]{1,4}:){0,5}:(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|(::([0-9A-Fa-f]{1,4}:){0,5}(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)</param> + </data> + </define> + + <define name="ipAddr"> + <choice> + <ref name="ipv4Addr"/> + <ref name="ipv6Addr"/> + </choice> + </define> + + <define name="ipv4Prefix"> + <data type="unsignedInt"> + <param name="maxInclusive">32</param> + </data> + </define> + + <define name="ipv6Prefix"> + <data type="unsignedInt"> + <param name="maxInclusive">128</param> + </data> + </define> + + <define name="ipPrefix"> + <choice> + <ref name="ipv4Prefix"/> + <ref name="ipv6Prefix"/> + </choice> + </define> + + <define name="dnsName"> + <data type="string"> + <param name="pattern">[a-zA-Z0-9\.\-]+</param> + </data> + </define> + + <define name="deviceName"> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_\.\-\\:/]+</param> + </data> + </define> + + <define name="filePath"> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_\.\+\-\\&"'<>/%]+</param> + </data> + </define> + + <define name="absFilePath"> + <data type="string"> + <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%]+</param> + </data> + </define> + + <define name="absDirPath"> + <data type="string"> + <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%]*</param> + </data> + </define> + +</grammar> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 891662d..5e8fc3c 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -5,6 +5,7 @@ <ref name="domain"/> </start> + <include href='basictypes.rng'/> <include href='storageencryption.rng'/>  - <define name="unsignedInt"> - <data type="unsignedInt"> - <param name="pattern">[0-9]+</param> - </data> - </define> - <define name='positiveInteger'> - <data type='positiveInteger'> - <param name="pattern">[0-9]+</param> - </data> - </define> <define name="cpuset"> <data type="string"> <param name="pattern">([0-9]+(-[0-9]+)?|\^[0-9]+)(,([0-9]+(-[0-9]+)?|\^[0-9]+))*</param> @@ -2372,11 +2361,6 @@ <param name="pattern">[0-9]+</param> </data> </define> - <define name="hostName"> - <data type="string"> - <param name="pattern">[a-zA-Z0-9\.\-]+</param> - </data> - </define> <define name="PortNumber"> <data type="short"> <param name="minInclusive">-1</param> @@ -2410,51 +2394,11 @@ <param name="pattern">[a-zA-Z0-9_\+\-]+</param> </data> </define> - <define name="UUID"> - <choice> - <data type="string"> - <param name="pattern">[a-fA-F0-9]{32}</param> - </data> - <data type="string"> - <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param> - </data> - </choice> - </define> - <define name="filePath"> - <data type="string"> - <param name="pattern">[a-zA-Z0-9_\.\+\-\\&"'<>/%]+</param> - </data> - </define> - <define name="absFilePath"> - <data type="string"> - <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%]+</param> - </data> - </define> - <define name="absDirPath"> - <data type="string"> - <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%]*</param> - </data> - </define> - <define name="deviceName"> - <data type="string"> - <param name="pattern">[a-zA-Z0-9_\.\-\\:/]+</param> - </data> - </define> <define name="bridgeMode"> <data type="string"> <param name="pattern">(vepa|bridge|private|passthrough)</param> </data> </define> - <define name="addrMAC"> - <data type="string"> - <param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param> - </data> - </define> - <define name="addrIP"> - <data type="string"> - <param name="pattern">([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9]</param> - </data> - </define> <define name="addrIPorName"> <data type="string"> <param name="pattern">(([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9])|(([0-9a-fA-F]+|:)+[0-9a-fA-F]+)|([a-zA-Z0-9_\.\+\-]*)</param> @@ -2530,28 +2474,6 @@ <param name="pattern">[a-zA-Z0-9_\.:]+</param> </data> </define> - <define name="uint8range"> - <choice> - <data type="string"> - <param name="pattern">0x[0-9a-fA-F]{1,2}</param> - </data> - <data type="int"> - <param name="minInclusive">0</param> - <param name="maxInclusive">255</param> - </data> - </choice> - </define> - <define name="uint24range"> - <choice> - <data type="string"> - <param name="pattern">0x[0-9a-fA-F]{1,6}</param> - </data> - <data type="int"> - <param name="minInclusive">0</param> - <param name="maxInclusive">16777215</param> - </data> - </choice> - </define> <define name="virtualPortProfileID"> <data type="string"> <param name="maxLength">39</param> diff --git a/docs/schemas/interface.rng b/docs/schemas/interface.rng index 4dd1bb4..53fa18a 100644 --- a/docs/schemas/interface.rng +++ b/docs/schemas/interface.rng @@ -1,3 +1,4 @@ +<?xml version="1.0"?>  <grammar xmlns="http://relaxng.org/ns/structure/1.0" xmlns:v="http://netcf.org/xml/version/1.0" @@ -16,6 +17,7 @@ </choice> </start> + <include href='basictypes.rng'/>  <optional> <element name="mac"> - <attribute name="address"><ref name="mac-addr"/></attribute> + <attribute name="address"><ref name="macAddr"/></attribute> </element> </optional>  @@ -75,7 +77,7 @@ <element name="vlan"> <attribute name="tag"><ref name="vlan-id"/></attribute> <element name="interface"> - <attribute name="name"><ref name="device-name"/></attribute> + <attribute name="name"><ref name="deviceName"/></attribute> </element> </element> </define> @@ -202,7 +204,7 @@ </element> <element name="arpmon"> <attribute name="interval"><ref name="uint"/></attribute> - <attribute name="target"><ref name="ipv4-addr"/></attribute> + <attribute name="target"><ref name="ipv4Addr"/></attribute> <optional> <attribute name="validate"> <choice> @@ -244,7 +246,7 @@  <define name="name-attr">  - <attribute name="name"><ref name="device-name"/></attribute> + <attribute name="name"><ref name="deviceName"/></attribute> </define> <define name="mtu"> @@ -303,14 +305,14 @@ <ref name="dhcp-element"/> <group> <element name="ip"> - <attribute name="address"><ref name="ipv4-addr"/></attribute> + <attribute name="address"><ref name="ipv4Addr"/></attribute> <optional> - <attribute name="prefix"><ref name="ipv4-prefix"/></attribute> + <attribute name="prefix"><ref name="ipv4Prefix"/></attribute> </optional> </element> <optional> <element name="route"> - <attribute name="gateway"><ref name="ipv4-addr"/></attribute> + <attribute name="gateway"><ref name="ipv4Addr"/></attribute> </element> </optional> </group> @@ -331,15 +333,15 @@ </optional> <zeroOrMore> <element name="ip"> - <attribute name="address"><ref name="ipv6-addr"/></attribute> + <attribute name="address"><ref name="ipv6Addr"/></attribute> <optional> - <attribute name="prefix"><ref name="ipv6-prefix"/></attribute> + <attribute name="prefix"><ref name="ipv6Prefix"/></attribute> </optional> </element> </zeroOrMore> <optional> <element name="route"> - <attribute name="gateway"><ref name="ipv6-addr"/></attribute> + <attribute name="gateway"><ref name="ipv6Addr"/></attribute> </element> </optional> </element> @@ -417,55 +419,6 @@ </data> </define> - <define name='device-name'> - <data type='string'> - <param name="pattern">[a-zA-Z0-9_\.\-:/]+</param> - </data> - </define> - - <define name='UUID'> - <choice> - <data type='string'> - <param name="pattern">[a-fA-F0-9]{32}</param> - </data> - <data type='string'> - <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param> - </data> - </choice> - </define> - - <define name='mac-addr'> - <data type='string'> - <param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param> - </data> - </define> - - <define name='ipv4-addr'> - <data type='string'> - <param name="pattern">(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))</param> - </data> - </define> - - <define name='ipv4-prefix'> - <data type='unsignedInt'> - <param name="maxInclusive">32</param> - </data> - </define> - -  - <define name='ipv6-addr'> - <data type='string'> -  - <param name="pattern">(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2})))\.){3}(((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2}))))|(([0-9A-Fa-f]{1,4}:){0,5}:((((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2})))\.){3}(((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2}))))|(::([0-9A-Fa-f]{1,4}:){0,5}((((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2})))\.){3}(((25[0-5])|(1[0-9]{2})|(2[0-4][0-9])|([0-9]{1,2}))))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)</param> - </data> - </define> - - <define name='ipv6-prefix'> - <data type='unsignedInt'> - <param name="maxInclusive">128</param> - </data> - </define> - <define name='vlan-id'> <data type="unsignedInt"> <param name="maxInclusive">4096</param> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 05f45e5..6d9f06b 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -1,3 +1,4 @@ +<?xml version="1.0"?>  <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> @@ -5,6 +6,8 @@ <ref name="network"/> </start> + <include href='basictypes.rng'/> + <define name="network"> <element name="network"> @@ -18,7 +21,7 @@  <optional> - <element name="uuid"><text/></element> + <element name="uuid"><ref name="UUID"/></element> </optional>  @@ -28,7 +31,7 @@ <element name="bridge"> <optional> <attribute name="name"> - <text/> + <ref name="deviceName"/> </attribute> </optional> @@ -53,7 +56,7 @@  <optional> <element name="mac"> - <attribute name="address"><ref name="mac-addr"/></attribute> + <attribute name="address"><ref name="macAddr"/></attribute> <empty/> </element> </optional> @@ -65,7 +68,7 @@ <element name="forward"> <optional> <attribute name="dev"> - <text/> + <ref name="deviceName"/> </attribute> </optional> @@ -83,7 +86,7 @@  <optional> <element name="domain"> - <attribute name="name"><text/></attribute> + <attribute name="name"><ref name="dnsName"/></attribute> </element> </optional> @@ -93,15 +96,15 @@ <element name="dns"> <zeroOrMore> <element name="txt"> - <attribute name="name"><ref name="dns-name"/></attribute> + <attribute name="name"><ref name="dnsName"/></attribute> <attribute name="value"><text/></attribute> </element> </zeroOrMore> <zeroOrMore> <element name="host"> - <attribute name="ip"><ref name="ipv4-addr"/></attribute> + <attribute name="ip"><ref name="ipv4Addr"/></attribute> <oneOrMore> - <element name="hostname"><text/></element> + <element name="hostname"><ref name="dnsName"/></element> </oneOrMore> </element> </zeroOrMore> @@ -114,12 +117,12 @@ local to the host. --> <element name="ip"> <optional> - <attribute name="address"><ref name="ip-addr"/></attribute> + <attribute name="address"><ref name="ipAddr"/></attribute> </optional> <optional> <choice> - <attribute name="netmask"><ref name="ipv4-addr"/></attribute> - <attribute name="prefix"><ref name="ip-prefix"/></attribute> + <attribute name="netmask"><ref name="ipv4Addr"/></attribute> + <attribute name="prefix"><ref name="ipPrefix"/></attribute> </choice> </optional> <optional> @@ -136,22 +139,22 @@ <element name="dhcp"> <zeroOrMore> <element name="range"> - <attribute name="start"><ref name="ipv4-addr"/></attribute> - <attribute name="end"><ref name="ipv4-addr"/></attribute> + <attribute name="start"><ref name="ipv4Addr"/></attribute> + <attribute name="end"><ref name="ipv4Addr"/></attribute> </element> </zeroOrMore> <zeroOrMore> <element name="host"> - <attribute name="mac"><ref name="mac-addr"/></attribute> + <attribute name="mac"><ref name="macAddr"/></attribute> <attribute name="name"><text/></attribute> - <attribute name="ip"><ref name="ipv4-addr"/></attribute> + <attribute name="ip"><ref name="ipv4Addr"/></attribute> </element> </zeroOrMore> <optional> <element name="bootp"> - <attribute name="file"><text/></attribute> + <attribute name="file"><ref name="filePath"/></attribute> <optional> - <attribute name="server"><text/></attribute> + <attribute name="server"><ref name="dnsName"/></attribute> </optional> </element> </optional> @@ -163,52 +166,10 @@ </element> </define> -  - <define name='ipv4-addr'> - <data type='string'> - <param name="pattern">(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))</param> - </data> - </define> - -  - <define name='ipv6-addr'> - <data type='string'> -  - <param name="pattern">(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|(([0-9A-Fa-f]{1,4}:){0,5}:(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|(::([0-9A-Fa-f]{1,4}:){0,5}(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)</param> - </data> - </define> - - <define name='ip-addr'> - <choice> - <ref name='ipv4-addr'/> - <ref name='ipv6-addr'/> - </choice> - </define> - - <define name='ip-prefix'> - <data type='unsignedInt'> - <param name="maxInclusive">128</param> - </data> - </define> - <define name='addr-family'> <data type='string'> <param name="pattern">(ipv4)|(ipv6)</param> </data> </define> -  - <define name='mac-addr'> - <data type='string'> - <param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param> - </data> - </define> - -  - <define name='dns-name'> - <data type='string'> - <param name="pattern">([a-zA-Z\-]+)</param> - </data> - </define> - </grammar> -- 1.7.3.4

2 1