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 misc QEMU structs/enums to use normal naming style

Browse Source 
Replace the following names

 * struct qemu_snap_remove  with virQEMUSnapRemovePtr
 * struct qemu_snap_reparent with virQEMUSnapReparentPtr
 * struct qemu_save_header with virQEMUSaveHeaderPtr
 * enum qemu_save_formats with virQEMUSaveFormat

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2012-11-28 17:29:44 +00:00
parent 4738c2a7e7
commit b7aba48bca
3 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_domain.c
View File

@ -1809,7 +1809,7 @@ void qemuDomainSnapshotDiscardAll(void *payload,
void *data) void *data)
{ {
virDomainSnapshotObjPtr snap = payload; virDomainSnapshotObjPtr snap = payload;
struct qemu_snap_remove *curr = data; virQEMUSnapRemovePtr curr = data;
int err; int err;
if (snap->def->current) if (snap->def->current)
@ -1824,7 +1824,7 @@ int
qemuDomainSnapshotDiscardAllMetadata(virQEMUDriverPtr driver, qemuDomainSnapshotDiscardAllMetadata(virQEMUDriverPtr driver,
virDomainObjPtr vm) virDomainObjPtr vm)
{ {
struct qemu_snap_remove rem; virQEMUSnapRemove rem;
rem.driver = driver; rem.driver = driver;
rem.vm = vm; rem.vm = vm;

4
src/qemu/qemu_domain.h
View File

@ -318,7 +318,9 @@ int qemuDomainSnapshotDiscard(virQEMUDriverPtr driver,
bool update_current, bool update_current,
bool metadata_only); bool metadata_only);
struct qemu_snap_remove { typedef struct _virQEMUSnapRemove virQEMUSnapRemove;
typedef virQEMUSnapRemove *virQEMUSnapRemovePtr;
struct _virQEMUSnapRemove {
virQEMUDriverPtr driver; virQEMUDriverPtr driver;
virDomainObjPtr vm; virDomainObjPtr vm;
int err; int err;

47
src/qemu/qemu_driver.c
View File

@ -2598,7 +2598,7 @@ cleanup:
verify(sizeof(QEMU_SAVE_MAGIC) == sizeof(QEMU_SAVE_PARTIAL)); verify(sizeof(QEMU_SAVE_MAGIC) == sizeof(QEMU_SAVE_PARTIAL));
enum qemu_save_formats { typedef enum {
QEMU_SAVE_FORMAT_RAW = 0, QEMU_SAVE_FORMAT_RAW = 0,
QEMU_SAVE_FORMAT_GZIP = 1, QEMU_SAVE_FORMAT_GZIP = 1,
QEMU_SAVE_FORMAT_BZIP2 = 2, QEMU_SAVE_FORMAT_BZIP2 = 2,
@ -2613,7 +2613,7 @@ enum qemu_save_formats {
Do not change or re-use numbers. */ Do not change or re-use numbers. */
QEMU_SAVE_FORMAT_LAST QEMU_SAVE_FORMAT_LAST
}; } virQEMUSaveFormat;
VIR_ENUM_DECL(qemuSaveCompression) VIR_ENUM_DECL(qemuSaveCompression)
VIR_ENUM_IMPL(qemuSaveCompression, QEMU_SAVE_FORMAT_LAST, VIR_ENUM_IMPL(qemuSaveCompression, QEMU_SAVE_FORMAT_LAST,
@ -2623,7 +2623,9 @@ VIR_ENUM_IMPL(qemuSaveCompression, QEMU_SAVE_FORMAT_LAST,
"xz", "xz",
"lzop") "lzop")
struct qemu_save_header { typedef struct _virQEMUSaveHeader virQEMUSaveHeader;
typedef virQEMUSaveHeader *virQEMUSaveHeaderPtr;
struct _virQEMUSaveHeader {
char magic[sizeof(QEMU_SAVE_MAGIC)-1]; char magic[sizeof(QEMU_SAVE_MAGIC)-1];
uint32_t version; uint32_t version;
uint32_t xml_len; uint32_t xml_len;
@ -2633,7 +2635,7 @@ struct qemu_save_header {
}; };
static inline void static inline void
bswap_header(struct qemu_save_header *hdr) { bswap_header(virQEMUSaveHeaderPtr hdr) {
hdr->version = bswap_32(hdr->version); hdr->version = bswap_32(hdr->version);
hdr->xml_len = bswap_32(hdr->xml_len); hdr->xml_len = bswap_32(hdr->xml_len);
hdr->was_running = bswap_32(hdr->was_running); hdr->was_running = bswap_32(hdr->was_running);
@ -2644,7 +2646,7 @@ bswap_header(struct qemu_save_header *hdr) {
/* return -errno on failure, or 0 on success */ /* return -errno on failure, or 0 on success */
static int static int
qemuDomainSaveHeader(int fd, const char *path, const char *xml, qemuDomainSaveHeader(int fd, const char *path, const char *xml,
struct qemu_save_header *header) virQEMUSaveHeaderPtr header)
{ {
int ret = 0; int ret = 0;
@ -2666,7 +2668,7 @@ endjob:
return ret; return ret;
} }
/* Given a enum qemu_save_formats compression level, return the name /* Given a virQEMUSaveFormat compression level, return the name
* of the program to run, or NULL if no program is needed. */ * of the program to run, or NULL if no program is needed. */
static const char * static const char *
qemuCompressProgramName(int compress) qemuCompressProgramName(int compress)
@ -2803,7 +2805,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver,
unsigned int flags, unsigned int flags,
enum qemuDomainAsyncJob asyncJob) enum qemuDomainAsyncJob asyncJob)
{ {
struct qemu_save_header header; virQEMUSaveHeader header;
bool bypassSecurityDriver = false; bool bypassSecurityDriver = false;
bool needUnlink = false; bool needUnlink = false;
int ret = -1; int ret = -1;
@ -3045,7 +3047,7 @@ cleanup:
} }
/* Returns true if a compression program is available in PATH */ /* Returns true if a compression program is available in PATH */
static bool qemuCompressProgramAvailable(enum qemu_save_formats compress) static bool qemuCompressProgramAvailable(virQEMUSaveFormat compress)
{ {
const char *prog; const char *prog;
char *c; char *c;
@ -3309,7 +3311,7 @@ static int
doCoreDump(virQEMUDriverPtr driver, doCoreDump(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
const char *path, const char *path,
enum qemu_save_formats compress, virQEMUSaveFormat compress,
unsigned int dump_flags) unsigned int dump_flags)
{ {
int fd = -1; int fd = -1;
@ -3371,7 +3373,7 @@ cleanup:
return ret; return ret;
} }
static enum qemu_save_formats static virQEMUSaveFormat
getCompressionType(virQEMUDriverPtr driver) getCompressionType(virQEMUDriverPtr driver)
{ {
int compress = QEMU_SAVE_FORMAT_RAW; int compress = QEMU_SAVE_FORMAT_RAW;
@ -4817,14 +4819,14 @@ static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4)
qemuDomainSaveImageOpen(virQEMUDriverPtr driver, qemuDomainSaveImageOpen(virQEMUDriverPtr driver,
const char *path, const char *path,
virDomainDefPtr *ret_def, virDomainDefPtr *ret_def,
struct qemu_save_header *ret_header, virQEMUSaveHeaderPtr ret_header,
bool bypass_cache, bool bypass_cache,
virFileWrapperFdPtr *wrapperFd, virFileWrapperFdPtr *wrapperFd,
const char *xmlin, int state, bool edit, const char *xmlin, int state, bool edit,
bool unlink_corrupt) bool unlink_corrupt)
{ {
int fd = -1; int fd = -1;
struct qemu_save_header header; virQEMUSaveHeader header;
char *xml = NULL; char *xml = NULL;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
int oflags = edit ? O_RDWR : O_RDONLY; int oflags = edit ? O_RDWR : O_RDONLY;
@ -4962,7 +4964,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
virQEMUDriverPtr driver, virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
int *fd, int *fd,
const struct qemu_save_header *header, const virQEMUSaveHeaderPtr header,
const char *path, const char *path,
bool start_paused) bool start_paused)
{ {
@ -5082,7 +5084,7 @@ qemuDomainRestoreFlags(virConnectPtr conn,
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
int fd = -1; int fd = -1;
int ret = -1; int ret = -1;
struct qemu_save_header header; virQEMUSaveHeader header;
virFileWrapperFdPtr wrapperFd = NULL; virFileWrapperFdPtr wrapperFd = NULL;
int state = -1; int state = -1;
@ -5154,7 +5156,7 @@ qemuDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *path,
char *ret = NULL; char *ret = NULL;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
int fd = -1; int fd = -1;
struct qemu_save_header header; virQEMUSaveHeader header;
/* We only take subset of virDomainDefFormat flags. */ /* We only take subset of virDomainDefFormat flags. */
virCheckFlags(VIR_DOMAIN_XML_SECURE, NULL); virCheckFlags(VIR_DOMAIN_XML_SECURE, NULL);
@ -5184,7 +5186,7 @@ qemuDomainSaveImageDefineXML(virConnectPtr conn, const char *path,
int ret = -1; int ret = -1;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
int fd = -1; int fd = -1;
struct qemu_save_header header; virQEMUSaveHeader header;
char *xml = NULL; char *xml = NULL;
size_t len; size_t len;
int state = -1; int state = -1;
@ -5261,7 +5263,7 @@ qemuDomainObjRestore(virConnectPtr conn,
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
int fd = -1; int fd = -1;
int ret = -1; int ret = -1;
struct qemu_save_header header; virQEMUSaveHeader header;
virFileWrapperFdPtr wrapperFd = NULL; virFileWrapperFdPtr wrapperFd = NULL;
fd = qemuDomainSaveImageOpen(driver, path, &def, &header, fd = qemuDomainSaveImageOpen(driver, path, &def, &header,
@ -12432,7 +12434,10 @@ cleanup:
return ret; return ret;
} }
struct snap_reparent {
typedef struct _virQEMUSnapReparent virQEMUSnapReparent;
typedef virQEMUSnapReparent *virQEMUSnapReparentPtr;
struct _virQEMUSnapReparent {
virQEMUDriverPtr driver; virQEMUDriverPtr driver;
virDomainSnapshotObjPtr parent; virDomainSnapshotObjPtr parent;
virDomainObjPtr vm; virDomainObjPtr vm;
@ -12446,7 +12451,7 @@ qemuDomainSnapshotReparentChildren(void *payload,
void *data) void *data)
{ {
virDomainSnapshotObjPtr snap = payload; virDomainSnapshotObjPtr snap = payload;
struct snap_reparent *rep = data; virQEMUSnapReparentPtr rep = data;
if (rep->err < 0) { if (rep->err < 0) {
return; return;
@ -12480,8 +12485,8 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot,
int ret = -1; int ret = -1;
virDomainSnapshotObjPtr snap = NULL; virDomainSnapshotObjPtr snap = NULL;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
struct qemu_snap_remove rem; virQEMUSnapRemove rem;
struct snap_reparent rep; virQEMUSnapReparent rep;
bool metadata_only = !!(flags & VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY); bool metadata_only = !!(flags & VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY);
int external = 0; int external = 0;