External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-12 12:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh-domain: update attach-interface to support type=hostdev

Browse Source 
Adding this feature will allow users to easily attach a hostdev network
interface using PCI passthrough.

The interface can be attached using --type=hostdev and PCI address or
as --source.  This command also allows you to tell, whether the interface
should be managed.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=997561

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2015-10-21 12:59:41 +02:00
parent 18657e9919
commit a9a583d6df
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/virsh-domain.c
View File

@ -56,6 +56,7 @@
#include "virtime.h"
#include "virtypedparam.h"
#include "virxml.h"
#include "virsh-nodedev.h"
/* Gnulib doesn't guarantee SA_SIGINFO support. */
#ifndef SA_SIGINFO
@ -866,6 +867,10 @@ static const vshCmdOptDef opts_attach_interface[] = {
.type = VSH_OT_BOOL,
.help = N_("print XML document rather than attach the interface")
},
{.name = "managed",
.type = VSH_OT_BOOL,
.help = N_("libvirt will automatically detach/attach the device from/to host")
},
{.name = NULL}
};
@ -931,6 +936,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
bool config = vshCommandOptBool(cmd, "config");
bool live = vshCommandOptBool(cmd, "live");
bool persistent = vshCommandOptBool(cmd, "persistent");
bool managed = vshCommandOptBool(cmd, "managed");
VSH_EXCLUSIVE_OPTIONS_VAR(persistent, current);
@ -983,7 +989,12 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
}
/* Make XML of interface */
virBufferAsprintf(&buf, "<interface type='%s'>\n", type);
virBufferAsprintf(&buf, "<interface type='%s'", type);
if (managed)
virBufferAddLit(&buf, " managed='yes'>\n");
else
virBufferAddLit(&buf, ">\n");
virBufferAdjustIndent(&buf, 2);
switch (typ) {
@ -995,6 +1006,26 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
case VIR_DOMAIN_NET_TYPE_DIRECT:
virBufferAsprintf(&buf, "<source dev='%s'/>\n", source);
break;
case VIR_DOMAIN_NET_TYPE_HOSTDEV:
{
struct PCIAddress pciAddr = {0, 0, 0, 0};
if (str2PCIAddress(source, &pciAddr) < 0) {
vshError(ctl, _("cannot parse pci address '%s' for network "
"interface"), source);
goto cleanup;
}
virBufferAddLit(&buf, "<source>\n");
virBufferAdjustIndent(&buf, 2);
virBufferAsprintf(&buf, "<address type='pci' domain='0x%.4x'"
" bus='0x%.2x' slot='0x%.2x' function='0x%.1x'/>\n",
pciAddr.domain, pciAddr.bus,
pciAddr.slot, pciAddr.function);
virBufferAdjustIndent(&buf, -2);
virBufferAddLit(&buf, "</source>\n");
break;
}
case VIR_DOMAIN_NET_TYPE_USER:
case VIR_DOMAIN_NET_TYPE_ETHERNET:
@ -1004,7 +1035,6 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
case VIR_DOMAIN_NET_TYPE_MCAST:
case VIR_DOMAIN_NET_TYPE_UDP:
case VIR_DOMAIN_NET_TYPE_INTERNAL:
case VIR_DOMAIN_NET_TYPE_HOSTDEV:
case VIR_DOMAIN_NET_TYPE_LAST:
vshError(ctl, _("No support for %s in command 'attach-interface'"),
type);

10
tools/virsh.pod
View File

@ -2522,6 +2522,9 @@ I<bridge> to indicate connection via a bridge device on the host,
I<direct> to indicate connection directly to one of the host's network
interfaces or bridges,
I<hostdev> to indicate connection using a passthrough of PCI device
on the host.
=back
B<source> indicates the source of the connection. The source depends
@ -2535,6 +2538,9 @@ I<bridge> the name of the bridge device,
I<direct> the name of the host's interface or bridge,
I<hostdev> the PCI address of the host's interface formatted
as domain:bus:slot.function.
=back
B<--target> is used to specify the tap/macvtap device to be used to
@ -2565,6 +2571,10 @@ kilobytes in a single burst at I<peak> speed as described in the
Network XML documentation at
L<http://libvirt.org/formatnetwork.html#elementQoS>.
B<--managed> is usable only for I<hostdev> type and tells libvirt
that the interface should be managed, which means detached and reattached
from/to the host by libvirt.
If B<--print-xml> is specified, then the XML of the interface that would be
attached is printed instead.