NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename virDomainDiskSGIO to virDomainDeviceSGIO

Browse Source 
SCSI host device will also support "sgio", and perhaps we could
use "sgio" in other places too in future, renaming the enum to
reuse.
This commit is contained in:
Osier Yang 2013-05-04 02:07:39 +08:00
parent 1d94b3e760
commit ead4391562
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/domain_conf.c
View File

@ -274,7 +274,7 @@ VIR_ENUM_IMPL(virDomainDiskIo, VIR_DOMAIN_DISK_IO_LAST,
"native", "native",
"threads") "threads")
VIR_ENUM_IMPL(virDomainDiskSGIO, VIR_DOMAIN_DISK_SGIO_LAST, VIR_ENUM_IMPL(virDomainDeviceSGIO, VIR_DOMAIN_DEVICE_SGIO_LAST,
"default", "default",
"filtered", "filtered",
"unfiltered") "unfiltered")
@ -5069,7 +5069,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
} }
if (sgio) { if (sgio) {
if ((def->sgio = virDomainDiskSGIOTypeFromString(sgio)) <= 0) { if ((def->sgio = virDomainDeviceSGIOTypeFromString(sgio)) <= 0) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("unknown disk sgio mode '%s'"), sgio); _("unknown disk sgio mode '%s'"), sgio);
goto error; goto error;
@ -13711,7 +13711,7 @@ virDomainDiskDefFormat(virBufferPtr buf,
const char *ioeventfd = virDomainIoEventFdTypeToString(def->ioeventfd); const char *ioeventfd = virDomainIoEventFdTypeToString(def->ioeventfd);
const char *event_idx = virDomainVirtioEventIdxTypeToString(def->event_idx); const char *event_idx = virDomainVirtioEventIdxTypeToString(def->event_idx);
const char *copy_on_read = virDomainDiskCopyOnReadTypeToString(def->copy_on_read); const char *copy_on_read = virDomainDiskCopyOnReadTypeToString(def->copy_on_read);
const char *sgio = virDomainDiskSGIOTypeToString(def->sgio); const char *sgio = virDomainDeviceSGIOTypeToString(def->sgio);
const char *discard = virDomainDiskDiscardTypeToString(def->discard); const char *discard = virDomainDiskDiscardTypeToString(def->discard);
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];

14
src/conf/domain_conf.h
View File

@ -618,12 +618,12 @@ enum virDomainDiskSecretType {
VIR_DOMAIN_DISK_SECRET_TYPE_LAST VIR_DOMAIN_DISK_SECRET_TYPE_LAST
}; };
enum virDomainDiskSGIO { enum virDomainDeviceSGIO {
VIR_DOMAIN_DISK_SGIO_DEFAULT = 0, VIR_DOMAIN_DEVICE_SGIO_DEFAULT = 0,
VIR_DOMAIN_DISK_SGIO_FILTERED, VIR_DOMAIN_DEVICE_SGIO_FILTERED,
VIR_DOMAIN_DISK_SGIO_UNFILTERED, VIR_DOMAIN_DEVICE_SGIO_UNFILTERED,
VIR_DOMAIN_DISK_SGIO_LAST VIR_DOMAIN_DEVICE_SGIO_LAST
}; };
enum virDomainDiskDiscard { enum virDomainDiskDiscard {
@ -715,7 +715,7 @@ struct _virDomainDiskDef {
virStorageEncryptionPtr encryption; virStorageEncryptionPtr encryption;
bool rawio_specified; bool rawio_specified;
int rawio; /* no = 0, yes = 1 */ int rawio; /* no = 0, yes = 1 */
int sgio; /* enum virDomainDiskSGIO */ int sgio; /* enum virDomainDeviceSGIO */
int discard; /* enum virDomainDiskDiscard */ int discard; /* enum virDomainDiskDiscard */
size_t nseclabels; size_t nseclabels;
@ -2472,7 +2472,7 @@ VIR_ENUM_DECL(virDomainDiskProtocol)
VIR_ENUM_DECL(virDomainDiskProtocolTransport) VIR_ENUM_DECL(virDomainDiskProtocolTransport)
VIR_ENUM_DECL(virDomainDiskIo) VIR_ENUM_DECL(virDomainDiskIo)
VIR_ENUM_DECL(virDomainDiskSecretType) VIR_ENUM_DECL(virDomainDiskSecretType)
VIR_ENUM_DECL(virDomainDiskSGIO) VIR_ENUM_DECL(virDomainDeviceSGIO)
VIR_ENUM_DECL(virDomainDiskTray) VIR_ENUM_DECL(virDomainDiskTray)
VIR_ENUM_DECL(virDomainDiskDiscard) VIR_ENUM_DECL(virDomainDiskDiscard)
VIR_ENUM_DECL(virDomainIoEventFd) VIR_ENUM_DECL(virDomainIoEventFd)

6
src/qemu/qemu_conf.c
View File

@ -1025,10 +1025,10 @@ qemuCheckSharedDisk(virHashTablePtr sharedDevices,
} }
if ((val == 0 && if ((val == 0 &&
(disk->sgio == VIR_DOMAIN_DISK_SGIO_FILTERED || (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_FILTERED ||
disk->sgio == VIR_DOMAIN_DISK_SGIO_DEFAULT)) || disk->sgio == VIR_DOMAIN_DEVICE_SGIO_DEFAULT)) ||
(val == 1 && (val == 1 &&
disk->sgio == VIR_DOMAIN_DISK_SGIO_UNFILTERED)) disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED))
goto cleanup; goto cleanup;
if (disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME) { if (disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME) {

2
src/qemu/qemu_process.c
View File

@ -3226,7 +3226,7 @@ qemuSetUnprivSGIO(virDomainDiskDefPtr disk)
return -1; return -1;
/* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0. */ /* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0. */
val = (disk->sgio == VIR_DOMAIN_DISK_SGIO_UNFILTERED); val = (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED);
/* Do not do anything if unpriv_sgio is not supported by the kernel and the /* Do not do anything if unpriv_sgio is not supported by the kernel and the
* whitelist is enabled. But if requesting unfiltered access, always call * whitelist is enabled. But if requesting unfiltered access, always call