External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

virsh: Rename 'struct DiskAddress' and friends

Browse Source 
Use 'virshAddress' prefix for all the related structs and enums.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Peter Krempa 2020-11-19 14:09:33 +01:00
parent 67bf91e1c3
commit 2978c06c4e
1 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
tools/virsh-domain.c
View File

@ -305,20 +305,20 @@ static const vshCmdOptDef opts_attach_disk[] = {
{.name = NULL} {.name = NULL}
}; };
enum diskAddrType { enum virshAddressType {
DISK_ADDR_TYPE_PCI, VIRSH_ADDRESS_TYPE_PCI,
DISK_ADDR_TYPE_SCSI, VIRSH_ADDRESS_TYPE_SCSI,
DISK_ADDR_TYPE_IDE, VIRSH_ADDRESS_TYPE_IDE,
DISK_ADDR_TYPE_CCW, VIRSH_ADDRESS_TYPE_CCW,
DISK_ADDR_TYPE_USB, VIRSH_ADDRESS_TYPE_USB,
DISK_ADDR_TYPE_SATA, VIRSH_ADDRESS_TYPE_SATA,
DISK_ADDR_TYPE_LAST VIRSH_ADDRESS_TYPE_LAST
}; };
VIR_ENUM_DECL(diskAddr); VIR_ENUM_DECL(virshAddress);
VIR_ENUM_IMPL(diskAddr, VIR_ENUM_IMPL(virshAddress,
DISK_ADDR_TYPE_LAST, VIRSH_ADDRESS_TYPE_LAST,
"pci", "pci",
"scsi", "scsi",
"ide", "ide",
@ -326,7 +326,7 @@ VIR_ENUM_IMPL(diskAddr,
"usb", "usb",
"sata"); "sata");
struct PCIAddress { struct virshAddressPCI {
unsigned int domain; unsigned int domain;
unsigned int bus; unsigned int bus;
unsigned int slot; unsigned int slot;
@ -334,30 +334,30 @@ struct PCIAddress {
bool multifunction; bool multifunction;
}; };
struct DriveAddress { struct virshAddressDrive {
unsigned int controller; unsigned int controller;
unsigned int bus; unsigned int bus;
unsigned long long unit; unsigned long long unit;
}; };
struct CCWAddress { struct virshAddressCCW {
unsigned int cssid; unsigned int cssid;
unsigned int ssid; unsigned int ssid;
unsigned int devno; unsigned int devno;
}; };
struct USBAddress { struct virshAddressUSB {
unsigned int bus; unsigned int bus;
unsigned int port; unsigned int port;
}; };
struct DiskAddress { struct virshAddress {
int type; int type; /* enum virshAddressType */
union { union {
struct PCIAddress pci; struct virshAddressPCI pci;
struct DriveAddress drive; struct virshAddressDrive drive;
struct CCWAddress ccw; struct virshAddressCCW ccw;
struct USBAddress usb; struct virshAddressUSB usb;
} addr; } addr;
}; };
@ -372,7 +372,7 @@ struct DiskAddress {
static int static int
virshAddressParse(const char *str, virshAddressParse(const char *str,
bool multifunction, bool multifunction,
struct DiskAddress *addr) struct virshAddress *addr)
{ {
g_autofree char *type = g_strdup(str); g_autofree char *type = g_strdup(str);
char *a = strchr(type, ':'); char *a = strchr(type, ':');
@ -382,10 +382,10 @@ virshAddressParse(const char *str,
*a = '\0'; *a = '\0';
addr->type = diskAddrTypeFromString(type); addr->type = virshAddressTypeFromString(type);
switch ((enum diskAddrType) addr->type) { switch ((enum virshAddressType) addr->type) {
case DISK_ADDR_TYPE_PCI: case VIRSH_ADDRESS_TYPE_PCI:
addr->addr.pci.multifunction = multifunction; addr->addr.pci.multifunction = multifunction;
if (virStrToLong_uip(++a, &a, 16, &addr->addr.pci.domain) < 0 || if (virStrToLong_uip(++a, &a, 16, &addr->addr.pci.domain) < 0 ||
@ -395,29 +395,29 @@ virshAddressParse(const char *str,
return -1; return -1;
break; break;
case DISK_ADDR_TYPE_SATA: case VIRSH_ADDRESS_TYPE_SATA:
case DISK_ADDR_TYPE_IDE: case VIRSH_ADDRESS_TYPE_IDE:
case DISK_ADDR_TYPE_SCSI: case VIRSH_ADDRESS_TYPE_SCSI:
if (virStrToLong_uip(++a, &a, 10, &addr->addr.drive.controller) < 0 || if (virStrToLong_uip(++a, &a, 10, &addr->addr.drive.controller) < 0 ||
virStrToLong_uip(++a, &a, 10, &addr->addr.drive.bus) < 0 || virStrToLong_uip(++a, &a, 10, &addr->addr.drive.bus) < 0 ||
virStrToLong_ullp(++a, &a, 10, &addr->addr.drive.unit) < 0) virStrToLong_ullp(++a, &a, 10, &addr->addr.drive.unit) < 0)
return -1; return -1;
break; break;
case DISK_ADDR_TYPE_CCW: case VIRSH_ADDRESS_TYPE_CCW:
if (virStrToLong_uip(++a, &a, 16, &addr->addr.ccw.cssid) < 0 || if (virStrToLong_uip(++a, &a, 16, &addr->addr.ccw.cssid) < 0 ||
virStrToLong_uip(++a, &a, 16, &addr->addr.ccw.ssid) < 0 || virStrToLong_uip(++a, &a, 16, &addr->addr.ccw.ssid) < 0 ||
virStrToLong_uip(++a, &a, 16, &addr->addr.ccw.devno) < 0) virStrToLong_uip(++a, &a, 16, &addr->addr.ccw.devno) < 0)
return -1; return -1;
break; break;
case DISK_ADDR_TYPE_USB: case VIRSH_ADDRESS_TYPE_USB:
if (virStrToLong_uip(++a, &a, 10, &addr->addr.usb.bus) < 0 || if (virStrToLong_uip(++a, &a, 10, &addr->addr.usb.bus) < 0 ||
virStrToLong_uip(++a, &a, 10, &addr->addr.usb.port) < 0) virStrToLong_uip(++a, &a, 10, &addr->addr.usb.port) < 0)
return -1; return -1;
break; break;
case DISK_ADDR_TYPE_LAST: case VIRSH_ADDRESS_TYPE_LAST:
default: default:
return -1; return -1;
} }
@ -428,10 +428,10 @@ virshAddressParse(const char *str,
static void static void
virshAddressFormat(virBufferPtr buf, virshAddressFormat(virBufferPtr buf,
struct DiskAddress *addr) struct virshAddress *addr)
{ {
switch ((enum diskAddrType) addr->type) { switch ((enum virshAddressType) addr->type) {
case DISK_ADDR_TYPE_PCI: case VIRSH_ADDRESS_TYPE_PCI:
virBufferAsprintf(buf, virBufferAsprintf(buf,
"<address type='pci' domain='0x%04x' bus='0x%02x' slot='0x%02x' function='0x%0x'", "<address type='pci' domain='0x%04x' bus='0x%02x' slot='0x%02x' function='0x%0x'",
addr->addr.pci.domain, addr->addr.pci.domain,
@ -445,9 +445,9 @@ virshAddressFormat(virBufferPtr buf,
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
break; break;
case DISK_ADDR_TYPE_SATA: case VIRSH_ADDRESS_TYPE_SATA:
case DISK_ADDR_TYPE_IDE: case VIRSH_ADDRESS_TYPE_IDE:
case DISK_ADDR_TYPE_SCSI: case VIRSH_ADDRESS_TYPE_SCSI:
virBufferAsprintf(buf, virBufferAsprintf(buf,
"<address type='drive' controller='%u' bus='%u' unit='%llu'/>\n", "<address type='drive' controller='%u' bus='%u' unit='%llu'/>\n",
addr->addr.drive.controller, addr->addr.drive.controller,
@ -455,7 +455,7 @@ virshAddressFormat(virBufferPtr buf,
addr->addr.drive.unit); addr->addr.drive.unit);
break; break;
case DISK_ADDR_TYPE_CCW: case VIRSH_ADDRESS_TYPE_CCW:
virBufferAsprintf(buf, virBufferAsprintf(buf,
"<address type='ccw' cssid='0x%02x' ssid='0x%01x' devno='0x%04x'/>\n", "<address type='ccw' cssid='0x%02x' ssid='0x%01x' devno='0x%04x'/>\n",
addr->addr.ccw.cssid, addr->addr.ccw.cssid,
@ -463,14 +463,14 @@ virshAddressFormat(virBufferPtr buf,
addr->addr.ccw.devno); addr->addr.ccw.devno);
break; break;
case DISK_ADDR_TYPE_USB: case VIRSH_ADDRESS_TYPE_USB:
virBufferAsprintf(buf, virBufferAsprintf(buf,
"<address type='usb' bus='%u' port='%u'/>\n", "<address type='usb' bus='%u' port='%u'/>\n",
addr->addr.usb.bus, addr->addr.usb.bus,
addr->addr.usb.port); addr->addr.usb.port);
break; break;
case DISK_ADDR_TYPE_LAST: case VIRSH_ADDRESS_TYPE_LAST:
default: default:
return; return;
} }
@ -484,7 +484,7 @@ cmdAttachDiskFormatAddress(vshControl *ctl,
const char *target, const char *target,
bool multifunction) bool multifunction)
{ {
struct DiskAddress diskAddr; struct virshAddress diskAddr;
if (virshAddressParse(straddr, multifunction, &diskAddr) < 0) { if (virshAddressParse(straddr, multifunction, &diskAddr) < 0) {
vshError(ctl, _("Invalid address.")); vshError(ctl, _("Invalid address."));
@ -492,22 +492,22 @@ cmdAttachDiskFormatAddress(vshControl *ctl,
} }
if (STRPREFIX((const char *)target, "vd")) { if (STRPREFIX((const char *)target, "vd")) {
if (diskAddr.type != DISK_ADDR_TYPE_PCI && if (diskAddr.type != VIRSH_ADDRESS_TYPE_PCI &&
diskAddr.type != DISK_ADDR_TYPE_CCW) { diskAddr.type != VIRSH_ADDRESS_TYPE_CCW) {
vshError(ctl, "%s", vshError(ctl, "%s",
_("expecting a pci:0000.00.00.00 or ccw:00.0.0000 address.")); _("expecting a pci:0000.00.00.00 or ccw:00.0.0000 address."));
return -1; return -1;
} }
} else if (STRPREFIX((const char *)target, "sd")) { } else if (STRPREFIX((const char *)target, "sd")) {
if (diskAddr.type != DISK_ADDR_TYPE_SCSI && if (diskAddr.type != VIRSH_ADDRESS_TYPE_SCSI &&
diskAddr.type != DISK_ADDR_TYPE_USB && diskAddr.type != VIRSH_ADDRESS_TYPE_USB &&
diskAddr.type != DISK_ADDR_TYPE_SATA) { diskAddr.type != VIRSH_ADDRESS_TYPE_SATA) {
vshError(ctl, "%s", vshError(ctl, "%s",
_("expecting a scsi:00.00.00 or usb:00.00 or sata:00.00.00 address.")); _("expecting a scsi:00.00.00 or usb:00.00 or sata:00.00.00 address."));
return -1; return -1;
} }
} else if (STRPREFIX((const char *)target, "hd")) { } else if (STRPREFIX((const char *)target, "hd")) {
if (diskAddr.type != DISK_ADDR_TYPE_IDE) { if (diskAddr.type != VIRSH_ADDRESS_TYPE_IDE) {
vshError(ctl, "%s", _("expecting an ide:00.00.00 address.")); vshError(ctl, "%s", _("expecting an ide:00.00.00 address."));
return -1; return -1;
} }
@ -892,7 +892,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_HOSTDEV:
{ {
g_autofree char *pciaddrstr = g_strdup_printf("pci:%s", source); g_autofree char *pciaddrstr = g_strdup_printf("pci:%s", source);
struct DiskAddress addr = { 0 }; struct virshAddress addr = { 0 };
if (virshAddressParse(pciaddrstr, false, &addr) < 0) { if (virshAddressParse(pciaddrstr, false, &addr) < 0) {
vshError(ctl, _("cannot parse pci address '%s' for network interface"), vshError(ctl, _("cannot parse pci address '%s' for network interface"),