On 09/13/2017 06:47 AM, Michal Privoznik wrote: > https://bugzilla.redhat.com/show_bug.cgi?id=1075520 > > Currently, all that users can specify for an interface type of > 'user' is the common attributes: PCI address, NIC model (and > that's basically it). However, some need to configure other > address range than the default one. > > Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> > --- > docs/formatdomain.html.in | 8 ++++- > src/qemu/qemu_domain.c | 9 ++++- > .../qemuxml2argv-net-user-addr.xml | 41 ++++++++++++++++++++++ > .../qemuxml2xmlout-net-user-addr.xml | 1 + > tests/qemuxml2xmltest.c | 1 + > 5 files changed, 58 insertions(+), 2 deletions(-) > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.xml > create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml > > diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in > index 8ca7637a4..2c0afb240 100644 > --- a/docs/formatdomain.html.in > +++ b/docs/formatdomain.html.in > @@ -4701,7 +4701,11 @@ > starting from <code>10.0.2.15</code>. The default router will be > <code>10.0.2.2</code> and the DNS server will be <code>10.0.2.3</code>. > This networking is the only option for unprivileged users who need their > - VMs to have outgoing access. > + VMs to have outgoing access. However, <span class="since">since 3.8.0</span> I think this sounds better without the "However". > + it is possible to override the default network address by including > + <code>ip</code> element. The element has one mandatory attribute > + <code>address</code>. Optionally, address <code>family</code> can be > + specified as well as <code>prefix</code>. > </p> ".. by including *an* <ip> element specifying an IPv4 address in its one mandatory attribute, <code>address</code>. Optionally, a second <ip> element with a <code>family</code> attribute set to "ipv6" can be specified to add an IPv6 address to the interface." Or something like that. > > <pre> > @@ -4711,6 +4715,8 @@ > ... > <interface type='user'> > <mac address="00:11:22:33:44:55"/> > + <ip family='ipv4' address='172.17.2.0' prefix='24'/> > + <ip family='ipv6' address='2001:db8:ac10:fd01::' prefix='64'/> > </interface> > </devices> > ...</pre> > diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c > index 72031893f..bccd30e12 100644 > --- a/src/qemu/qemu_domain.c > +++ b/src/qemu/qemu_domain.c > @@ -3342,7 +3342,14 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, > if (dev->type == VIR_DOMAIN_DEVICE_NET) { > const virDomainNetDef *net = dev->data.net; > > - if (net->guestIP.nroutes || net->guestIP.nips) { > + if (net->type == VIR_DOMAIN_NET_TYPE_USER) { > + if (net->guestIP.nroutes) { > + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", > + _("Invalid attempt to set network interface " > + "guest-side IP route, not supported by QEMU")); > + goto cleanup; > + } > + } else if (net->guestIP.nroutes || net->guestIP.nips) { > virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", > _("Invalid attempt to set network interface " > "guest-side IP route and/or address info, " > diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.xml > new file mode 100644 > index 000000000..0b5f15198 > --- /dev/null > +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.xml > @@ -0,0 +1,41 @@ > +<domain type='qemu'> > + <name>QEMUGuest1</name> > + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> > + <memory unit='KiB'>219136</memory> > + <currentMemory unit='KiB'>219136</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='i686' machine='pc'>hvm</type> > + <boot dev='hd'/> > + </os> > + <clock offset='utc'/> > + <on_poweroff>destroy</on_poweroff> > + <on_reboot>restart</on_reboot> > + <on_crash>destroy</on_crash> > + <devices> > + <emulator>/usr/bin/qemu-system-i686</emulator> > + <disk type='block' device='disk'> > + <driver name='qemu' type='raw'/> > + <source dev='/dev/HostVG/QEMUGuest1'/> > + <target dev='hda' bus='ide'/> > + <address type='drive' controller='0' bus='0' target='0' unit='0'/> > + </disk> > + <controller type='usb' index='0'> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> > + </controller> > + <controller type='ide' index='0'> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> > + </controller> > + <controller type='pci' index='0' model='pci-root'/> > + <interface type='user'> > + <mac address='00:11:22:33:44:55'/> > + <ip address='172.17.2.0' family='ipv4' prefix='24'/> > + <ip address='2001:db8:ac10:fd01::' family='ipv6' prefix='64'/> > + <model type='rtl8139'/> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> > + </interface> > + <input type='mouse' bus='ps2'/> > + <input type='keyboard' bus='ps2'/> > + <memballoon model='none'/> > + </devices> > +</domain> > diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml > new file mode 120000 > index 000000000..fd909ec24 > --- /dev/null > +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml > @@ -0,0 +1 @@ > +../qemuxml2argvdata/qemuxml2argv-net-user-addr.xml > \ No newline at end of file > diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c > index 0a87cedf2..efac9e828 100644 > --- a/tests/qemuxml2xmltest.c > +++ b/tests/qemuxml2xmltest.c > @@ -531,6 +531,7 @@ mymain(void) > DO_TEST("misc-uuid", NONE); > DO_TEST("net-vhostuser", NONE); > DO_TEST("net-user", NONE); > + DO_TEST("net-user-addr", QEMU_CAPS_NETDEV); > DO_TEST("net-virtio", NONE); > DO_TEST("net-virtio-device", NONE); > DO_TEST("net-virtio-disable-offloads", NONE); ACK. -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
