Re: [libvirt] [PATCH v2 20/23] qemu-command: use -net socket, fd= with slirp-helper

[Michal Privoznik]

On 8/8/19 4:55 PM, marcandre.lur...@redhat.com wrote:

From: Marc-André Lureau 

If a slirp-helper is associated with a network interface (after
probing & preparing succesfully), pass the socket fd to QEMU and use
"-net socket,fd=".

Signed-off-by: Marc-André Lureau 
---
  src/qemu/qemu_command.c | 35 +--
  src/qemu/qemu_command.h |  3 ++-
  src/qemu/qemu_hotplug.c |  4 +++-
  3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4357aa2fe1..90e61a336e 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -28,6 +28,7 @@
  #include "qemu_alias.h"
  #include "qemu_security.h"
  #include "qemu_dbus.h"
+#include "qemu_slirp.h"
  #include "qemu_block.h"
  #include "cpu/cpu.h"
  #include "dirname.h"
@@ -4008,7 +4009,8 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
  char **tapfd,
  size_t tapfdSize,
  char **vhostfd,
-size_t vhostfdSize)
+size_t vhostfdSize,
+const char *slirpfd)
  {
  bool is_tap = false;
  virBuffer buf = VIR_BUFFER_INITIALIZER;
@@ -4079,6 +4081,12 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
  break;
  
  case VIR_DOMAIN_NET_TYPE_USER:

+if (slirpfd) {
+virBufferAsprintf(, "socket,fd=%s,",
+  slirpfd);
+break;
+}


No, please don't put a break at random places within 'case' bodies.


+
  virBufferAddLit(, "user,");
  for (i = 0; i < net->guestIP.nips; i++) {
  const virNetDevIPAddr *ip = net->guestIP.ips[i];
@@ -8634,10 +8642,10 @@ qemuInterfaceVhostuserConnect(virQEMUDriverPtr driver,
  
  static int

  qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
+  virDomainObjPtr vm,
virLogManagerPtr logManager,
virSecurityManagerPtr secManager,
virCommandPtr cmd,
-  virDomainDefPtr def,
virDomainNetDefPtr net,
virQEMUCapsPtr qemuCaps,
unsigned int bootindex,
@@ -8646,6 +8654,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
size_t *nnicindexes,
int **nicindexes)
  {
+virDomainDefPtr def = vm->def;
  int ret = -1;
  char *nic = NULL;
  char *host = NULL;
@@ -8656,9 +8665,11 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
  size_t vhostfdSize = 0;
  char **tapfdName = NULL;
  char **vhostfdName = NULL;
+VIR_AUTOFREE(char *) slirpfdName = NULL;
  virDomainNetType actualType = virDomainNetGetActualType(net);
  virNetDevBandwidthPtr actualBandwidth;
  bool requireNicdev = false;
+qemuSlirpPtr slirp;
  size_t i;
  
  
@@ -8884,6 +8895,16 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,

  goto cleanup;
  }
  
+slirp = QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp;

+if (slirp && !standalone) {
+int slirpfd = qemuSlirpGetFD(slirp);
+virCommandPassFD(cmd, slirpfd,
+ VIR_COMMAND_PASS_FD_CLOSE_PARENT);
+if (virAsprintf(, "%d", slirpfd) < 0)
+goto cleanup;
+}
+
+
  for (i = 0; i < tapfdSize; i++) {
  if (qemuSecuritySetTapFDLabel(driver->securityManager,
def, tapfd[i]) < 0)
@@ -8908,7 +8929,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
  
  if (!(host = qemuBuildHostNetStr(net, driver,

   tapfdName, tapfdSize,
- vhostfdName, vhostfdSize)))
+ vhostfdName, vhostfdSize,
+ slirpfdName)))
  goto cleanup;
  virCommandAddArgList(cmd, "-netdev", host, NULL);
  
@@ -8976,10 +8998,10 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,

   */
  static int
  qemuBuildNetCommandLine(virQEMUDriverPtr driver,
+virDomainObjPtr vm,
  virLogManagerPtr logManager,
  virSecurityManagerPtr secManager,
  virCommandPtr cmd,
-virDomainDefPtr def,
  virQEMUCapsPtr qemuCaps,
  virNetDevVPortProfileOp vmop,
  bool standalone,
@@ -8990,6 +9012,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver,
  size_t i;
  int last_good_net = -1;
  virErrorPtr originalError = NULL;
+virDomainDefPtr def = vm->def;
  
  if (def->nnets) {

  unsigned int bootNet = 0;
@@ -9005,7 +9028,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver,
  for (i = 0; i < def->nnets; i++) {
   

[libvirt] [PATCH v2 20/23] qemu-command: use -net socket, fd= with slirp-helper

[marcandre . lureau]

From: Marc-André Lureau 

If a slirp-helper is associated with a network interface (after
probing & preparing succesfully), pass the socket fd to QEMU and use
"-net socket,fd=".

Signed-off-by: Marc-André Lureau 
---
 src/qemu/qemu_command.c | 35 +--
 src/qemu/qemu_command.h |  3 ++-
 src/qemu/qemu_hotplug.c |  4 +++-
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4357aa2fe1..90e61a336e 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -28,6 +28,7 @@
 #include "qemu_alias.h"
 #include "qemu_security.h"
 #include "qemu_dbus.h"
+#include "qemu_slirp.h"
 #include "qemu_block.h"
 #include "cpu/cpu.h"
 #include "dirname.h"
@@ -4008,7 +4009,8 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
 char **tapfd,
 size_t tapfdSize,
 char **vhostfd,
-size_t vhostfdSize)
+size_t vhostfdSize,
+const char *slirpfd)
 {
 bool is_tap = false;
 virBuffer buf = VIR_BUFFER_INITIALIZER;
@@ -4079,6 +4081,12 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
 break;
 
 case VIR_DOMAIN_NET_TYPE_USER:
+if (slirpfd) {
+virBufferAsprintf(, "socket,fd=%s,",
+  slirpfd);
+break;
+}
+
 virBufferAddLit(, "user,");
 for (i = 0; i < net->guestIP.nips; i++) {
 const virNetDevIPAddr *ip = net->guestIP.ips[i];
@@ -8634,10 +8642,10 @@ qemuInterfaceVhostuserConnect(virQEMUDriverPtr driver,
 
 static int
 qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
+  virDomainObjPtr vm,
   virLogManagerPtr logManager,
   virSecurityManagerPtr secManager,
   virCommandPtr cmd,
-  virDomainDefPtr def,
   virDomainNetDefPtr net,
   virQEMUCapsPtr qemuCaps,
   unsigned int bootindex,
@@ -8646,6 +8654,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
   size_t *nnicindexes,
   int **nicindexes)
 {
+virDomainDefPtr def = vm->def;
 int ret = -1;
 char *nic = NULL;
 char *host = NULL;
@@ -8656,9 +8665,11 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
 size_t vhostfdSize = 0;
 char **tapfdName = NULL;
 char **vhostfdName = NULL;
+VIR_AUTOFREE(char *) slirpfdName = NULL;
 virDomainNetType actualType = virDomainNetGetActualType(net);
 virNetDevBandwidthPtr actualBandwidth;
 bool requireNicdev = false;
+qemuSlirpPtr slirp;
 size_t i;
 
 
@@ -8884,6 +8895,16 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
 goto cleanup;
 }
 
+slirp = QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp;
+if (slirp && !standalone) {
+int slirpfd = qemuSlirpGetFD(slirp);
+virCommandPassFD(cmd, slirpfd,
+ VIR_COMMAND_PASS_FD_CLOSE_PARENT);
+if (virAsprintf(, "%d", slirpfd) < 0)
+goto cleanup;
+}
+
+
 for (i = 0; i < tapfdSize; i++) {
 if (qemuSecuritySetTapFDLabel(driver->securityManager,
   def, tapfd[i]) < 0)
@@ -8908,7 +8929,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
 
 if (!(host = qemuBuildHostNetStr(net, driver,
  tapfdName, tapfdSize,
- vhostfdName, vhostfdSize)))
+ vhostfdName, vhostfdSize,
+ slirpfdName)))
 goto cleanup;
 virCommandAddArgList(cmd, "-netdev", host, NULL);
 
@@ -8976,10 +8998,10 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
  */
 static int
 qemuBuildNetCommandLine(virQEMUDriverPtr driver,
+virDomainObjPtr vm,
 virLogManagerPtr logManager,
 virSecurityManagerPtr secManager,
 virCommandPtr cmd,
-virDomainDefPtr def,
 virQEMUCapsPtr qemuCaps,
 virNetDevVPortProfileOp vmop,
 bool standalone,
@@ -8990,6 +9012,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver,
 size_t i;
 int last_good_net = -1;
 virErrorPtr originalError = NULL;
+virDomainDefPtr def = vm->def;
 
 if (def->nnets) {
 unsigned int bootNet = 0;
@@ -9005,7 +9028,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver,
 for (i = 0; i < def->nnets; i++) {
 virDomainNetDefPtr net = def->nets[i];
 
-if (qemuBuildInterfaceCommandLine(driver, logManager, secManager, 
cmd, def, net,
+if (qemuBuildInterfaceCommandLine(driver, vm, logManager,