- Devel - libvirt List Archives

[libvirt] [PATCH] network: fix indentation in networkBuildDnsmasqArgv
by Laine Stump 27 Jun '11

27 Jun '11

This block was inadvertently added with the wrong indentation. --- src/network/bridge_driver.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 1b11132..f15a7a6 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -614,14 +614,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 (dctx->hostsfile->nhosts) - virCommandAddArgPair(cmd, "--dhcp-hostsfile", - dctx->hostsfile->path); - if (dctx->addnhostsfile->nhosts) - virCommandAddArgPair(cmd, "--addn-hosts", - dctx->addnhostsfile->path); - + if ((dctx = networkSaveDnsmasqHostsfile(ipdef, network->def->dns, network->def->name, false))) { + if (dctx->hostsfile->nhosts) + virCommandAddArgPair(cmd, "--dhcp-hostsfile", + dctx->hostsfile->path); + if (dctx->addnhostsfile->nhosts) + virCommandAddArgPair(cmd, "--addn-hosts", + dctx->addnhostsfile->path); dnsmasqContextFree(dctx); } -- 1.7.3.4

2 2

[libvirt] [PATCH] tests: Handle networkxml2argvtest being configure --localstatedir dependant
by Matthias Bolte 27 Jun '11

27 Jun '11

networkxml2argvtest indirectly calls networkDnsmasqLeaseFileName that depends on configure --localstatedir. Therefore, the .argv files used in the test have to be created with this localstatedir. Move the .argv to .argv.in files with a @localstatedir@ placeholder. --- tests/.gitignore | 1 + tests/Makefile.am | 13 ++++++++++++- ...lated-network.argv => isolated-network.argv.in} | 2 +- ...ns-hosts.argv => nat-network-dns-hosts.argv.in} | 2 +- ...ord.argv => nat-network-dns-txt-record.argv.in} | 2 +- .../{nat-network.argv => nat-network.argv.in} | 2 +- ...etboot-network.argv => netboot-network.argv.in} | 2 +- ...-network.argv => netboot-proxy-network.argv.in} | 2 +- ...{routed-network.argv => routed-network.argv.in} | 0 9 files changed, 19 insertions(+), 7 deletions(-) rename tests/networkxml2argvdata/{isolated-network.argv => isolated-network.argv.in} (68%) rename tests/networkxml2argvdata/{nat-network-dns-hosts.argv => nat-network-dns-hosts.argv.in} (64%) rename tests/networkxml2argvdata/{nat-network-dns-txt-record.argv => nat-network-dns-txt-record.argv.in} (84%) rename tests/networkxml2argvdata/{nat-network.argv => nat-network.argv.in} (83%) rename tests/networkxml2argvdata/{netboot-network.argv => netboot-network.argv.in} (80%) rename tests/networkxml2argvdata/{netboot-proxy-network.argv => netboot-proxy-network.argv.in} (79%) rename tests/networkxml2argvdata/{routed-network.argv => routed-network.argv.in} (100%) diff --git a/tests/.gitignore b/tests/.gitignore index 7f26dd7..be8d321 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -10,6 +10,7 @@ conftest esxutilstest eventtest interfacexml2xmltest +networkxml2argvdata/*.argv networkxml2xmltest nodedevxml2xmltest nodeinfotest diff --git a/tests/Makefile.am b/tests/Makefile.am index 7db9d1f..3c4b7ee 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -50,7 +50,8 @@ EXTRA_DIST = \ networkschematest \ networkxml2xmlin \ networkxml2xmlout \ - networkxml2argvdata \ + $(wildcard networkxml2argvdata/*.argv.in) \ + $(wildcard networkxml2argvdata/*.xml) \ nodedevschemadata \ nodedevschematest \ nodeinfodata \ @@ -358,10 +359,20 @@ networkxml2xmltest_SOURCES = \ testutils.c testutils.h networkxml2xmltest_LDADD = $(LDADDS) +networkxml2argvdata_argv_in = $(wildcard networkxml2argvdata/*.argv.in) +networkxml2argvdata_argv = $(networkxml2argvdata_argv_in:%.argv.in=%.argv) + networkxml2argvtest_SOURCES = \ networkxml2argvtest.c \ testutils.c testutils.h networkxml2argvtest_LDADD = ../src/libvirt_driver_network.la $(LDADDS) +networkxml2argvtest_DEPENDENCIES = $(networkxml2argvdata_argv) + +$(srcdir)/networkxml2argvdata/%.argv: $(srcdir)/networkxml2argvdata/%.argv.in + $(AM_V_GEN)sed \ + -e 's![@]localstatedir[@]!$(localstatedir)!g' \ + < $< > $@-t && \ + mv $@-t $@ nwfilterxml2xmltest_SOURCES = \ nwfilterxml2xmltest.c \ diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv.in similarity index 68% rename from tests/networkxml2argvdata/isolated-network.argv rename to tests/networkxml2argvdata/isolated-network.argv.in index f801396..c05768d 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv.in @@ -1,5 +1,5 @@ /usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ --except-interface lo --dhcp-option=3 --listen-address 192.168.152.1 \ --dhcp-range 192.168.152.2,192.168.152.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 \ +--dhcp-leasefile=@localstatedir@/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 \ --dhcp-no-override\ diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv.in similarity index 64% rename from tests/networkxml2argvdata/nat-network-dns-hosts.argv rename to tests/networkxml2argvdata/nat-network-dns-hosts.argv.in index dce075b..5545f9f 100644 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv +++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv.in @@ -1,3 +1,3 @@ /usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ --except-interface lo --listen-address 192.168.122.1 \ ---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ +--addn-hosts=@localstatedir@/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv.in similarity index 84% rename from tests/networkxml2argvdata/nat-network-dns-txt-record.argv rename to tests/networkxml2argvdata/nat-network-dns-txt-record.argv.in index 9d74543..f799634 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv.in @@ -4,5 +4,5 @@ --listen-address 2001:db8:ac10:fe01::1 \ --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-leasefile=@localstatedir@/lib/libvirt/dnsmasq/default.leases \ --dhcp-lease-max=253 --dhcp-no-override\ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv.in similarity index 83% rename from tests/networkxml2argvdata/nat-network.argv rename to tests/networkxml2argvdata/nat-network.argv.in index 181623f..680241b 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv.in @@ -3,5 +3,5 @@ --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \ --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-leasefile=@localstatedir@/lib/libvirt/dnsmasq/default.leases \ --dhcp-lease-max=253 --dhcp-no-override\ diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv.in similarity index 80% rename from tests/networkxml2argvdata/netboot-network.argv rename to tests/networkxml2argvdata/netboot-network.argv.in index 27ffaa1..57cda0e 100644 --- a/tests/networkxml2argvdata/netboot-network.argv +++ b/tests/networkxml2argvdata/netboot-network.argv.in @@ -1,6 +1,6 @@ /usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ +--dhcp-leasefile=@localstatedir@/lib/libvirt/dnsmasq/netboot.leases \ --dhcp-lease-max=253 --dhcp-no-override --enable-tftp \ --tftp-root /var/lib/tftproot --dhcp-boot pxeboot.img\ diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv.in similarity index 79% rename from tests/networkxml2argvdata/netboot-proxy-network.argv rename to tests/networkxml2argvdata/netboot-proxy-network.argv.in index 3e0c5a5..723539e 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv.in @@ -1,5 +1,5 @@ /usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ +--dhcp-leasefile=@localstatedir@/lib/libvirt/dnsmasq/netboot.leases \ --dhcp-lease-max=253 --dhcp-no-override --dhcp-boot pxeboot.img,,10.20.30.40\ diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv.in similarity index 100% rename from tests/networkxml2argvdata/routed-network.argv rename to tests/networkxml2argvdata/routed-network.argv.in -- 1.7.0.4

3 5

[libvirt] [PATCH 0/3] Add Processor/MemoryDevice information to virSysinfoRead() API
by Minoru Usui 27 Jun '11

27 Jun '11

Hi, I propose to add hardware Processor/MemoryDevice information to virSysinfoRead() from SMBIOS. I want to get host machine's these infomations through virConnectGetSysinfo(). I think it's useful to managing many host machines, because administrator can centrally manage the host machines which consists of Processor/MemoryDevice parts. This patch set adds DMI type4, 17 information(dmidecode -t4,17) to virSysinfoRead(). I hope this patch set adds v0.9.3, if possible. Minoru Usui (3): Cleanup virSysinfoRead() Separate BIOSInfo and SystemInfo part from virSysinfoRead() Add Processor Information to virSysinfoRead() from dmidecode type 4 Add Memory Device Information to virSysinfoRead() from dmidecode type 17 src/util/sysinfo.c | 608 +++++++++++++++++++++++++++++++++++++++++++++------- src/util/sysinfo.h | 37 ++++ 2 files changed, 565 insertions(+), 80 deletions(-) -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

3 14

[libvirt] [PATCH 1/2] build: fix VPATH builds
by Eric Blake 25 Jun '11

25 Jun '11

The build currently fails when trying to create virnetprotocol.c into $(builddir)/rpc, which doesn't exist. But since the file is part of the tarball, it should be generated into $(srcdir). Caught by autobuild.sh. * src/Makefile.am (VIR_NET_RPC_GENERATED): Generate into srcdir. --- Pushing under the build-breaker rule. src/Makefile.am | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 15a207e..1e7b905 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1201,7 +1201,9 @@ EXTRA_DIST += \ rpc/gendispatch.pl \ rpc/genprotocol.pl -VIR_NET_RPC_GENERATED = rpc/virnetprotocol.h rpc/virnetprotocol.c +VIR_NET_RPC_GENERATED = \ + $(srcdir)/rpc/virnetprotocol.h \ + $(srcdir)/rpc/virnetprotocol.c BUILT_SOURCES += $(VIR_NET_RPC_GENERATED) -- 1.7.4.4

1 1

[libvirt] [PATCH 0/5] RFC: vcpuinfo, vcpupin: the feature to get CPU affinity information
by Taku Izumi 24 Jun '11

24 Jun '11

Hi all, This patchset improves the "virsh vcpupin" and "virsh vcpuinfo" command. This is based on the following Eric's comment: http://www.redhat.com/archives/libvir-list/2011-June/msg00500.html We can use virDomainGetVcpus API to get it, but can't use this API against inactive domains (at least in case of KVM). There is the companion API of this, whose name is virDomainGetVcpusFlags. However its signature is different from what everyone expect, so we can't use this. This patchset introduces the new libvirt API to retrieve CPU affinity information and adds the code to use new API. To be specific, the following are changed. (i) "virsh vcpuinfo" comes to succeed in case of the target domain is inactive on KVM. # virsh domstate VM shut off # virsh vcpuinfo VM VCPU: 0 CPU: N/A State: N/A CPU time N/A CPU Affinity: -yyyyyy--yyyyyyyyyyyy------------------- VCPU: 1 CPU: N/A State: N/A CPU time N/A CPU Affinity: ----------y----------------------------- VCPU: 2 CPU: N/A State: N/A CPU time N/A CPU Affinity: -----y---yyy---yyyyyy------------------- VCPU: 3 CPU: N/A State: N/A CPU time N/A CPU Affinity: -y-y-y-y-y-y-y-y------------------------ (ii) The --query option is added to virsh vcpupin command. # virsh vcpupin VM --query --config VCPU: CPU Affinity ---------------------------------- 0: 1-6,9-20 1: 10 2: 5,9-11,15-20 3: 1,3,5,7,9,11,13,15 --- *[PATCH 1/5] vcpupin: introduce the new libvirt API (virDomainGetVcpupinInfo) *[PATCH 2/5] vcpupin: implement the code to support new API for the qemu driver *[PATCH 3/5] vcpupin: implement the remote protocol to address the new API *[PATCH 4/5] vcpuinfo: add the code to fallback to try new API *[PATCH 5/5] vcpupin: add query option to virsh vcpupin command Best regards, Taku Izumi

4 16

[libvirt] [PATCH 0/2] docs: fix indentation of sub-elements of <ip> in network XML
by Laine Stump 24 Jun '11

24 Jun '11

The first patch actually makes changes to the html tags, and re-orders some of the paragraphs. The second patch is only whitespace changes.

2 4

[libvirt] [PATCH] buf: protect against integer overflow
by Eric Blake 24 Jun '11

24 Jun '11

It's unlikely that we'll ever want to escape a string as long as INT_MAX/6, but adding this check can't hurt. * src/util/buf.c (virBufferEscapeSexpr, virBufferEscapeString): Check for (unlikely) overflow. --- src/util/buf.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/buf.c b/src/util/buf.c index 750e277..5002486 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -311,7 +311,8 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st return; } - if (VIR_ALLOC_N(escaped, 6 * len + 1) < 0) { + if (xalloc_oversized(6, len) || + VIR_ALLOC_N(escaped, 6 * len + 1) < 0) { virBufferSetError(buf); return; } @@ -398,7 +399,8 @@ virBufferEscapeSexpr(const virBufferPtr buf, return; } - if (VIR_ALLOC_N(escaped, 2 * len + 1) < 0) { + if (xalloc_oversized(2, len) || + VIR_ALLOC_N(escaped, 2 * len + 1) < 0) { virBufferSetError(buf); return; } -- 1.7.4.4

2 2

[libvirt] [PATCH 1/2] build: update gnulib
by Eric Blake 24 Jun '11

24 Jun '11

Done as a separate commit to make backporting the next patch easier. * .gnulib: Update, for syntax-check fix. --- If anyone needs to backport the next patch, it will be easier to add an appropriate INT_MULTIPLY_OVERFLOW macro in "internal.h" than to do a gnulib update, so I've separated these two tasks. .gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index 478c2dc..25e4c2e 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 478c2dcc839e5f4765e6417684ce414e2d4973a8 +Subproject commit 25e4c2ec96602d132ad4429d6eaebaea1a8f504b -- 1.7.4.4

2 5

[libvirt] [PATCH] build: avoid long line tests
by Eric Blake 24 Jun '11

24 Jun '11

'make syntax-check' regression introduced in commit 60b9c69. * tests/networkxml2argvdata/*.argv: Break long lines. --- Pushing under the build-breaker rule. tests/networkxml2argvdata/isolated-network.argv | 6 +++++- .../networkxml2argvdata/nat-network-dns-hosts.argv | 4 +++- .../nat-network-dns-txt-record.argv | 9 ++++++++- tests/networkxml2argvdata/nat-network.argv | 8 +++++++- tests/networkxml2argvdata/netboot-network.argv | 7 ++++++- .../networkxml2argvdata/netboot-proxy-network.argv | 6 +++++- tests/networkxml2argvdata/routed-network.argv | 3 ++- 7 files changed, 36 insertions(+), 7 deletions(-) diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv index e0993fb..f801396 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv @@ -1 +1,5 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= --except-interface lo --dhcp-option=3 --listen-address 192.168.152.1 --dhcp-range 192.168.152.2,192.168.152.254 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 --dhcp-no-override \ No newline at end of file +/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +--except-interface lo --dhcp-option=3 --listen-address 192.168.152.1 \ +--dhcp-range 192.168.152.2,192.168.152.254 \ +--dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 \ +--dhcp-no-override\ diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv index d240bf4..dce075b 100644 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv +++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv @@ -1 +1,3 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= --except-interface lo --listen-address 192.168.122.1 --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts \ No newline at end of file +/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +--except-interface lo --listen-address 192.168.122.1 \ +--addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index c000808..9d74543 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -1 +1,8 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= --except-interface lo --txt-record=example,example value --listen-address 192.168.122.1 --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 --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 \ No newline at end of file +/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +--except-interface lo --txt-record=example,example value \ +--listen-address 192.168.122.1 --listen-address 192.168.123.1 \ +--listen-address 2001:db8:ac10:fe01::1 \ +--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\ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv index d58672f..181623f 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv @@ -1 +1,7 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= --except-interface lo --listen-address 192.168.122.1 --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 --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 \ No newline at end of file +/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +--except-interface lo --listen-address 192.168.122.1 \ +--listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \ +--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\ diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv index c5db9e0..27ffaa1 100644 --- a/tests/networkxml2argvdata/netboot-network.argv +++ b/tests/networkxml2argvdata/netboot-network.argv @@ -1 +1,6 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com --conf-file= --except-interface lo --listen-address 192.168.122.1 --dhcp-range 192.168.122.2,192.168.122.254 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases --dhcp-lease-max=253 --dhcp-no-override --enable-tftp --tftp-root /var/lib/tftproot --dhcp-boot pxeboot.img \ No newline at end of file +/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +--conf-file= --except-interface lo --listen-address 192.168.122.1 \ +--dhcp-range 192.168.122.2,192.168.122.254 \ +--dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ +--dhcp-lease-max=253 --dhcp-no-override --enable-tftp \ +--tftp-root /var/lib/tftproot --dhcp-boot pxeboot.img\ diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv index 06e5b08..3e0c5a5 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv @@ -1 +1,5 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com --conf-file= --except-interface lo --listen-address 192.168.122.1 --dhcp-range 192.168.122.2,192.168.122.254 --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases --dhcp-lease-max=253 --dhcp-no-override --dhcp-boot pxeboot.img,,10.20.30.40 \ No newline at end of file +/usr/sbin/dnsmasq --strict-order --bind-interfaces --domain example.com \ +--conf-file= --except-interface lo --listen-address 192.168.122.1 \ +--dhcp-range 192.168.122.2,192.168.122.254 \ +--dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ +--dhcp-lease-max=253 --dhcp-no-override --dhcp-boot pxeboot.img,,10.20.30.40\ diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv index bf5f579..d059630 100644 --- a/tests/networkxml2argvdata/routed-network.argv +++ b/tests/networkxml2argvdata/routed-network.argv @@ -1 +1,2 @@ -/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= --except-interface lo --listen-address 192.168.122.1 \ No newline at end of file +/usr/sbin/dnsmasq --strict-order --bind-interfaces --conf-file= \ +--except-interface lo --listen-address 192.168.122.1\ -- 1.7.4.4

1 0

[libvirt] [PATCH] Rename iface(G|S)etMacaddr to iface(G|S)etMacAddress for consistency
by Matthias Bolte 24 Jun '11

24 Jun '11

--- src/libvirt_private.syms | 4 ++-- src/util/interface.c | 26 +++++++++++++------------- src/util/interface.h | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f34ef9e..ea2414d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -498,7 +498,7 @@ ifaceCheck; ifaceCtrl; ifaceGetFlags; ifaceGetIndex; -ifaceGetMacaddr; +ifaceGetMacAddress; ifaceGetNthParent; ifaceGetVlanID; ifaceIsUp; @@ -507,7 +507,7 @@ ifaceMacvtapLinkAdd; ifaceMacvtapLinkDump; ifaceReplaceMacAddress; ifaceRestoreMacAddress; -ifaceSetMacaddr; +ifaceSetMacAddress; # interface_conf.h diff --git a/src/util/interface.c b/src/util/interface.c index a5ab271..d51ceec 100644 --- a/src/util/interface.c +++ b/src/util/interface.c @@ -397,7 +397,7 @@ ifaceGetVlanID(const char *vlanifname ATTRIBUTE_UNUSED, #endif /* __linux__ */ /** - * ifaceGetMacaddr: + * ifaceGetMacAddress: * @ifname: interface name to set MTU for * @macaddr: MAC address (VIR_MAC_BUFLEN in size) * @@ -407,8 +407,8 @@ ifaceGetVlanID(const char *vlanifname ATTRIBUTE_UNUSED, */ #ifdef __linux__ int -ifaceGetMacaddr(const char *ifname, - unsigned char *macaddr) +ifaceGetMacAddress(const char *ifname, + unsigned char *macaddr) { struct ifreq ifr; int fd; @@ -435,8 +435,8 @@ ifaceGetMacaddr(const char *ifname, #else int -ifaceGetMacaddr(const char *ifname ATTRIBUTE_UNUSED, - unsigned char *macaddr ATTRIBUTE_UNUSED) +ifaceGetMacAddress(const char *ifname ATTRIBUTE_UNUSED, + unsigned char *macaddr ATTRIBUTE_UNUSED) { return ENOSYS; } @@ -444,7 +444,7 @@ ifaceGetMacaddr(const char *ifname ATTRIBUTE_UNUSED, #endif /* __linux__ */ /** - * ifaceSetMacaddr: + * ifaceSetMacAddress: * @ifname: interface name to set MTU for * @macaddr: MAC address (VIR_MAC_BUFLEN in size) * @@ -455,8 +455,8 @@ ifaceGetMacaddr(const char *ifname ATTRIBUTE_UNUSED, */ #ifdef __linux__ int -ifaceSetMacaddr(const char *ifname, - const unsigned char *macaddr) +ifaceSetMacAddress(const char *ifname, + const unsigned char *macaddr) { struct ifreq ifr; int fd; @@ -484,8 +484,8 @@ ifaceSetMacaddr(const char *ifname, #else int -ifaceSetMacaddr(const char *ifname ATTRIBUTE_UNUSED, - const unsigned char *macaddr ATTRIBUTE_UNUSED) +ifaceSetMacAddress(const char *ifname ATTRIBUTE_UNUSED, + const unsigned char *macaddr ATTRIBUTE_UNUSED) { return ENOSYS; } @@ -1027,7 +1027,7 @@ ifaceReplaceMacAddress(const unsigned char *macaddress, unsigned char oldmac[6]; int rc; - rc = ifaceGetMacaddr(linkdev, oldmac); + rc = ifaceGetMacAddress(linkdev, oldmac); if (rc) { virReportSystemError(rc, @@ -1054,7 +1054,7 @@ ifaceReplaceMacAddress(const unsigned char *macaddress, } } - rc = ifaceSetMacaddr(linkdev, macaddress); + rc = ifaceSetMacAddress(linkdev, macaddress); if (rc) { virReportSystemError(rc, _("Setting MAC address on '%s' to " @@ -1104,7 +1104,7 @@ ifaceRestoreMacAddress(const char *linkdev, } /*reset mac and remove file-ignore results*/ - rc = ifaceSetMacaddr(linkdev, oldmac); + rc = ifaceSetMacAddress(linkdev, oldmac); if (rc) { virReportSystemError(rc, _("Setting MAC address on '%s' to " diff --git a/src/util/interface.h b/src/util/interface.h index 663fabb..5cbf5c1 100644 --- a/src/util/interface.h +++ b/src/util/interface.h @@ -45,9 +45,9 @@ int ifaceGetIndex(bool reportError, const char *ifname, int *ifindex); int ifaceGetVlanID(const char *vlanifname, int *vlanid); -int ifaceSetMacaddr(const char *ifname, const unsigned char *macaddr); +int ifaceSetMacAddress(const char *ifname, const unsigned char *macaddr); -int ifaceGetMacaddr(const char *ifname, unsigned char *macaddr); +int ifaceGetMacAddress(const char *ifname, unsigned char *macaddr); int ifaceMacvtapLinkAdd(const char *type, const unsigned char *macaddress, int macaddrsize, -- 1.7.0.4

2 2