External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-01 20:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add the port allocation logic for isa-serial devices.

Browse Source 
This commit takes care of following cases:
-> Check availability of requested ports.
  ->The total number of requested ports should not be more than
    VIR_MAX_ISA_SERIAL_PORTS.
  ->The ports requested should be less than VIR_MAX_ISA_SERIAL_PORTS.
  ->VIR_MAX_ISA_SERIAL_PORTS should correspond to MAX_ISA_SERIAL_PORTS
    specified in QEMU code commit def337ffda34d331404bd7f1a42726b71500df22.
-> Prevent duplicate device assignments to the same port.
-> In case no ports are provided in the XML, this patch scans the list of unused
   isa-serial indices to automatically assign available ports for this VM.

Signed-off-by: Divya Garg <divya.garg@nutanix.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Divya Garg 2022-01-12 23:33:40 -08:00 committed by Michal Privoznik
parent d8f6e198bf
commit 11ddab1daf
9 changed files with 70 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/conf/domain_conf.c
View File

@ -5330,6 +5330,58 @@ virDomainHostdevDefPostParse(virDomainHostdevDef *dev,
}
static int
virDomainChrIsaSerialDefPostParse(virDomainDef *def)
{
size_t i;
size_t isa_serial_count = 0;
bool used_serial_port[VIR_MAX_ISA_SERIAL_PORTS] = { false };
/* Perform all the required checks. */
for (i = 0; i < def->nserials; i++) {
if (def->serials[i]->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL)
continue;
if (isa_serial_count++ >= VIR_MAX_ISA_SERIAL_PORTS ||
def->serials[i]->target.port >= VIR_MAX_ISA_SERIAL_PORTS) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Maximum supported number of ISA serial ports is '%d'"),
VIR_MAX_ISA_SERIAL_PORTS);
return -1;
}
if (def->serials[i]->target.port != -1) {
if (used_serial_port[def->serials[i]->target.port]) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("target port '%d' already allocated"),
def->serials[i]->target.port);
return -1;
}
used_serial_port[def->serials[i]->target.port] = true;
}
}
/* Assign the ports to the devices. */
for (i = 0; i < def->nserials; i++) {
size_t j;
if (def->serials[i]->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL ||
def->serials[i]->target.port != -1)
continue;
for (j = 0; j < VIR_MAX_ISA_SERIAL_PORTS; j++) {
if (!used_serial_port[j]) {
def->serials[i]->target.port = j;
used_serial_port[j] = true;
break;
}
}
}
return 0;
}
static void
virDomainChrDefPostParse(virDomainChrDef *chr,
const virDomainDef *def)
@ -6197,6 +6249,9 @@ virDomainDefPostParse(virDomainDef *def,
goto cleanup;
}
if (virDomainChrIsaSerialDefPostParse(def) < 0)
return -1;
/* iterate the devices */
ret = virDomainDeviceInfoIterateFlags(def,
virDomainDefPostParseDeviceIterator,
@ -19929,14 +19984,6 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt,
if (!chr)
return NULL;
if (chr->target.port == -1) {
int maxport = -1;
for (j = 0; j < i; j++) {
if (def->serials[j]->target.port > maxport)
maxport = def->serials[j]->target.port;
}
chr->target.port = maxport + 1;
}
def->serials[def->nserials++] = chr;
}
VIR_FREE(nodes);

6
src/conf/domain_conf.h
View File

@ -1187,6 +1187,12 @@ typedef enum {
VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST
} virDomainChrConsoleTargetType;
/*
* The value of VIR_MAX_ISA_SERIAL_PORTS corresponds to MAX_ISA_SERIAL_PORTS
* set in QEMU code base.
*/
#define VIR_MAX_ISA_SERIAL_PORTS 4
typedef enum {
VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE = 0,
VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL,

4
tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+console-virtio.xml
View File

@ -74,7 +74,7 @@
<alias name='serial0'/>
</serial>
<serial type='pty'>
<target type='isa-serial' port='0'>
<target type='isa-serial' port='1'>
<model name='isa-serial'/>
</target>
<alias name='serial1'/>
@ -82,7 +82,7 @@
<serial type='tcp'>
<source mode='bind' host='0.0.0.0' service='2445'/>
<protocol type='raw'/>
<target type='isa-serial' port='1'>
<target type='isa-serial' port='2'>
<model name='isa-serial'/>
</target>
<alias name='serial2'/>

4
tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml
View File

@ -74,7 +74,7 @@
<alias name='serial0'/>
</serial>
<serial type='pty'>
<target type='isa-serial' port='0'>
<target type='isa-serial' port='1'>
<model name='isa-serial'/>
</target>
<alias name='serial1'/>
@ -82,7 +82,7 @@
<serial type='tcp'>
<source mode='bind' host='0.0.0.0' service='2445'/>
<protocol type='raw'/>
<target type='isa-serial' port='1'>
<target type='isa-serial' port='2'>
<model name='isa-serial'/>
</target>
<alias name='serial2'/>

2
tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
View File

@ -37,7 +37,7 @@
<serial type='tcp'>
<source mode='connect' host='127.0.0.1' service='5555' tls='no'/>
<protocol type='raw'/>
<target type='isa-serial' port='0'>
<target type='isa-serial' port='1'>
<model name='isa-serial'/>
</target>
</serial>

2
tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml
View File

@ -29,7 +29,7 @@
<serial type='tcp'>
<source mode='connect' host='127.0.0.1' service='5555'/>
<protocol type='raw'/>
<target port='0'/>
<target port='1'/>
</serial>
<console type='udp'>
<source mode='bind' host='127.0.0.1' service='1111'/>

2
tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml
View File

@ -29,7 +29,7 @@
<serial type='tcp'>
<source mode='connect' host='127.0.0.1' service='5555'/>
<protocol type='raw'/>
<target port='0'/>
<target port='1'/>
</serial>
<console type='udp'>
<source mode='bind' host='127.0.0.1' service='1111'/>

2
tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml
View File

@ -34,7 +34,7 @@
<serial type='tcp'>
<source mode='connect' host='127.0.0.1' service='5555'/>
<protocol type='raw'/>
<target port='0'/>
<target port='1'/>
</serial>
<console type='udp'>
<source mode='bind' host='127.0.0.1' service='1111'/>

2
tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
View File

@ -37,7 +37,7 @@
<serial type='tcp'>
<source mode='connect' host='127.0.0.1' service='5555'/>
<protocol type='raw'/>
<target type='isa-serial' port='0'>
<target type='isa-serial' port='1'>
<model name='isa-serial'/>
</target>
</serial>