Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 32803ba4 编写于 作者: D Daniel P. Berrange
浏览文件
操作

Rename 'qemuCapsXXX' to 'virQEMUCapsXXX' 

To avoid confusion between 'virCapsPtr' and 'qemuCapsPtr'
do some renaming of various fucntions/variables. All
instances of 'qemuCapsPtr' are renamed to 'qemuCaps'. To
avoid that clashing with the 'qemuCaps' typedef though,
rename the latter to virQEMUCaps.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 fed92f08
展开全部 隐藏空白更改
内联 并排
Showing with 1218 addition and 1216 deletion
src/qemu/qemu_capabilities.c
浏览文件 @ 32803ba4
此差异已折叠。
src/qemu/qemu_capabilities.h
浏览文件 @ 32803ba4
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
# include "qemu_monitor.h" # include "qemu_monitor.h"
/* Internal flags to keep track of qemu command line capabilities */ /* Internal flags to keep track of qemu command line capabilities */
enum qemuCapsFlags { enum virQEMUCapsFlags {
QEMU_CAPS_KQEMU = 0, /* Whether KQEMU is compiled in */ QEMU_CAPS_KQEMU = 0, /* Whether KQEMU is compiled in */
QEMU_CAPS_VNC_COLON = 1, /* VNC takes or address + display */ QEMU_CAPS_VNC_COLON = 1, /* VNC takes or address + display */
QEMU_CAPS_NO_REBOOT = 2, /* Is the -no-reboot flag available */ QEMU_CAPS_NO_REBOOT = 2, /* Is the -no-reboot flag available */
...@@ -170,79 +170,81 @@ enum qemuCapsFlags { ...@@ -170,79 +170,81 @@ enum qemuCapsFlags {
QEMU_CAPS_LAST, /* this must always be the last item */ QEMU_CAPS_LAST, /* this must always be the last item */
}; };
typedef struct _qemuCaps qemuCaps; typedef struct _virQEMUCaps virQEMUCaps;
typedef qemuCaps *qemuCapsPtr; typedef virQEMUCaps *virQEMUCapsPtr;
typedef struct _qemuCapsCache qemuCapsCache; typedef struct _virQEMUCapsCache virQEMUCapsCache;
typedef qemuCapsCache *qemuCapsCachePtr; typedef virQEMUCapsCache *virQEMUCapsCachePtr;
qemuCapsPtr qemuCapsNew(void); virQEMUCapsPtr virQEMUCapsNew(void);
qemuCapsPtr qemuCapsNewCopy(qemuCapsPtr caps); virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps);
qemuCapsPtr qemuCapsNewForBinary(const char *binary, virQEMUCapsPtr virQEMUCapsNewForBinary(const char *binary,
const char *libDir, const char *libDir,
uid_t runUid, uid_t runUid,
gid_t runGid); gid_t runGid);
int qemuCapsProbeQMP(qemuCapsPtr caps, int virQEMUCapsProbeQMP(virQEMUCapsPtr qemuCaps,
qemuMonitorPtr mon); qemuMonitorPtr mon);
void qemuCapsSet(qemuCapsPtr caps, void virQEMUCapsSet(virQEMUCapsPtr qemuCaps,
enum qemuCapsFlags flag) ATTRIBUTE_NONNULL(1); enum virQEMUCapsFlags flag) ATTRIBUTE_NONNULL(1);
void qemuCapsSetList(qemuCapsPtr caps, ...) ATTRIBUTE_NONNULL(1); void virQEMUCapsSetList(virQEMUCapsPtr qemuCaps, ...) ATTRIBUTE_NONNULL(1);
void qemuCapsClear(qemuCapsPtr caps, void virQEMUCapsClear(virQEMUCapsPtr qemuCaps,
enum qemuCapsFlags flag) ATTRIBUTE_NONNULL(1); enum virQEMUCapsFlags flag) ATTRIBUTE_NONNULL(1);
bool qemuCapsGet(qemuCapsPtr caps, bool virQEMUCapsGet(virQEMUCapsPtr qemuCaps,
enum qemuCapsFlags flag); enum virQEMUCapsFlags flag);
char *qemuCapsFlagsString(qemuCapsPtr caps); char *virQEMUCapsFlagsString(virQEMUCapsPtr qemuCaps);
const char *qemuCapsGetBinary(qemuCapsPtr caps); const char *virQEMUCapsGetBinary(virQEMUCapsPtr qemuCaps);
virArch qemuCapsGetArch(qemuCapsPtr caps); virArch virQEMUCapsGetArch(virQEMUCapsPtr qemuCaps);
unsigned int qemuCapsGetVersion(qemuCapsPtr caps); unsigned int virQEMUCapsGetVersion(virQEMUCapsPtr qemuCaps);
unsigned int qemuCapsGetKVMVersion(qemuCapsPtr caps); unsigned int virQEMUCapsGetKVMVersion(virQEMUCapsPtr qemuCaps);
int qemuCapsAddCPUDefinition(qemuCapsPtr caps, int virQEMUCapsAddCPUDefinition(virQEMUCapsPtr qemuCaps,
const char *name); const char *name);
size_t qemuCapsGetCPUDefinitions(qemuCapsPtr caps, size_t virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
char ***names); char ***names);
size_t qemuCapsGetMachineTypes(qemuCapsPtr caps, size_t virQEMUCapsGetMachineTypes(virQEMUCapsPtr qemuCaps,
char ***names); char ***names);
const char *qemuCapsGetCanonicalMachine(qemuCapsPtr caps, const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps,
const char *name); const char *name);
int qemuCapsGetMachineTypesCaps(qemuCapsPtr caps, int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps,
size_t *nmachines, size_t *nmachines,
virCapsGuestMachinePtr **machines); virCapsGuestMachinePtr **machines);
bool qemuCapsIsValid(qemuCapsPtr caps); bool virQEMUCapsIsValid(virQEMUCapsPtr qemuCaps);
qemuCapsCachePtr qemuCapsCacheNew(const char *libDir, virQEMUCapsCachePtr virQEMUCapsCacheNew(const char *libDir,
uid_t uid, gid_t gid); uid_t uid, gid_t gid);
qemuCapsPtr qemuCapsCacheLookup(qemuCapsCachePtr cache, const char *binary); virQEMUCapsPtr virQEMUCapsCacheLookup(virQEMUCapsCachePtr cache,
qemuCapsPtr qemuCapsCacheLookupCopy(qemuCapsCachePtr cache, const char *binary); const char *binary);
void qemuCapsCacheFree(qemuCapsCachePtr cache); virQEMUCapsPtr virQEMUCapsCacheLookupCopy(virQEMUCapsCachePtr cache,
const char *binary);
void virQEMUCapsCacheFree(virQEMUCapsCachePtr cache);
virCapsPtr qemuCapsInit(qemuCapsCachePtr cache); virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache);
int qemuCapsGetDefaultVersion(virCapsPtr caps, int virQEMUCapsGetDefaultVersion(virCapsPtr caps,
qemuCapsCachePtr capsCache, virQEMUCapsCachePtr capsCache,
unsigned int *version); unsigned int *version);
/* Only for use by test suite */ /* Only for use by test suite */
int qemuCapsParseHelpStr(const char *qemu, int virQEMUCapsParseHelpStr(const char *qemu,
const char *str, const char *str,
qemuCapsPtr caps, virQEMUCapsPtr qemuCaps,
unsigned int *version, unsigned int *version,
unsigned int *is_kvm, unsigned int *is_kvm,
unsigned int *kvm_version, unsigned int *kvm_version,
bool check_yajl); bool check_yajl);
/* Only for use by test suite */ /* Only for use by test suite */
int qemuCapsParseDeviceStr(qemuCapsPtr caps, const char *str); int virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str);
VIR_ENUM_DECL(qemuCaps); VIR_ENUM_DECL(virQEMUCaps);
bool qemuCapsUsedQMP(qemuCapsPtr caps); bool virQEMUCapsUsedQMP(virQEMUCapsPtr qemuCaps);
#endif /* __QEMU_CAPABILITIES_H__*/ #endif /* __QEMU_CAPABILITIES_H__*/
src/qemu/qemu_command.c
浏览文件 @ 32803ba4
此差异已折叠。
src/qemu/qemu_command.h
浏览文件 @ 32803ba4
...@@ -54,7 +54,7 @@ virCommandPtr qemuBuildCommandLine(virConnectPtr conn, ...@@ -54,7 +54,7 @@ virCommandPtr qemuBuildCommandLine(virConnectPtr conn,
virDomainDefPtr def, virDomainDefPtr def,
virDomainChrSourceDefPtr monitor_chr, virDomainChrSourceDefPtr monitor_chr,
bool monitor_json, bool monitor_json,
qemuCapsPtr caps, virQEMUCapsPtr qemuCaps,
const char *migrateFrom, const char *migrateFrom,
int migrateFd, int migrateFd,
virDomainSnapshotObjPtr current_snapshot, virDomainSnapshotObjPtr current_snapshot,
...@@ -64,14 +64,14 @@ virCommandPtr qemuBuildCommandLine(virConnectPtr conn, ...@@ -64,14 +64,14 @@ virCommandPtr qemuBuildCommandLine(virConnectPtr conn,
/* Generate string for arch-specific '-device' parameter */ /* Generate string for arch-specific '-device' parameter */
char * char *
qemuBuildChrDeviceStr (virDomainChrDefPtr serial, qemuBuildChrDeviceStr (virDomainChrDefPtr serial,
qemuCapsPtr caps, virQEMUCapsPtr qemuCaps,
virArch arch, virArch arch,
char *machine); char *machine);
/* With vlan == -1, use netdev syntax, else old hostnet */ /* With vlan == -1, use netdev syntax, else old hostnet */
char * qemuBuildHostNetStr(virDomainNetDefPtr net, char * qemuBuildHostNetStr(virDomainNetDefPtr net,
virQEMUDriverPtr driver, virQEMUDriverPtr driver,
qemuCapsPtr caps, virQEMUCapsPtr qemuCaps,
char type_sep, char type_sep,
int vlan, int vlan,
const char *tapfd, const char *tapfd,
...@@ -86,50 +86,50 @@ char * qemuBuildNicStr(virDomainNetDefPtr net, ...@@ -86,50 +86,50 @@ char * qemuBuildNicStr(virDomainNetDefPtr net,
char * qemuBuildNicDevStr(virDomainNetDefPtr net, char * qemuBuildNicDevStr(virDomainNetDefPtr net,
int vlan, int vlan,
int bootindex, int bootindex,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
/* Both legacy & current support */ /* Both legacy & current support */
char *qemuBuildDriveStr(virConnectPtr conn, char *qemuBuildDriveStr(virConnectPtr conn,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
bool bootable, bool bootable,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
char *qemuBuildFSStr(virDomainFSDefPtr fs, char *qemuBuildFSStr(virDomainFSDefPtr fs,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildDriveDevStr(virDomainDefPtr def, char * qemuBuildDriveDevStr(virDomainDefPtr def,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
int bootindex, int bootindex,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
char * qemuBuildFSDevStr(virDomainFSDefPtr fs, char * qemuBuildFSDevStr(virDomainFSDefPtr fs,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildControllerDevStr(virDomainDefPtr domainDef, char * qemuBuildControllerDevStr(virDomainDefPtr domainDef,
virDomainControllerDefPtr def, virDomainControllerDefPtr def,
qemuCapsPtr caps, virQEMUCapsPtr qemuCaps,
int *nusbcontroller); int *nusbcontroller);
char * qemuBuildWatchdogDevStr(virDomainWatchdogDefPtr dev, char * qemuBuildWatchdogDevStr(virDomainWatchdogDefPtr dev,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
char * qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev, char * qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
char * qemuBuildSoundDevStr(virDomainSoundDefPtr sound, char * qemuBuildSoundDevStr(virDomainSoundDefPtr sound,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
/* Legacy, pre device support */ /* Legacy, pre device support */
char * qemuBuildPCIHostdevPCIDevStr(virDomainHostdevDefPtr dev); char * qemuBuildPCIHostdevPCIDevStr(virDomainHostdevDefPtr dev);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildPCIHostdevDevStr(virDomainHostdevDefPtr dev, char * qemuBuildPCIHostdevDevStr(virDomainHostdevDefPtr dev,
const char *configfd, const char *configfd,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
int qemuOpenPCIConfig(virDomainHostdevDefPtr dev); int qemuOpenPCIConfig(virDomainHostdevDefPtr dev);
...@@ -137,61 +137,61 @@ int qemuOpenPCIConfig(virDomainHostdevDefPtr dev); ...@@ -137,61 +137,61 @@ int qemuOpenPCIConfig(virDomainHostdevDefPtr dev);
char * qemuBuildUSBHostdevUsbDevStr(virDomainHostdevDefPtr dev); char * qemuBuildUSBHostdevUsbDevStr(virDomainHostdevDefPtr dev);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildUSBHostdevDevStr(virDomainHostdevDefPtr dev, char * qemuBuildUSBHostdevDevStr(virDomainHostdevDefPtr dev,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
char * qemuBuildHubDevStr(virDomainHubDefPtr dev, qemuCapsPtr caps); char * qemuBuildHubDevStr(virDomainHubDefPtr dev, virQEMUCapsPtr qemuCaps);
char * qemuBuildRedirdevDevStr(virDomainDefPtr def, char * qemuBuildRedirdevDevStr(virDomainDefPtr def,
virDomainRedirdevDefPtr dev, virDomainRedirdevDefPtr dev,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
int qemuNetworkIfaceConnect(virDomainDefPtr def, int qemuNetworkIfaceConnect(virDomainDefPtr def,
virConnectPtr conn, virConnectPtr conn,
virQEMUDriverPtr driver, virQEMUDriverPtr driver,
virDomainNetDefPtr net, virDomainNetDefPtr net,
qemuCapsPtr caps) virQEMUCapsPtr qemuCaps)
ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(2);
int qemuPhysIfaceConnect(virDomainDefPtr def, int qemuPhysIfaceConnect(virDomainDefPtr def,
virQEMUDriverPtr driver, virQEMUDriverPtr driver,
virDomainNetDefPtr net, virDomainNetDefPtr net,
qemuCapsPtr caps, virQEMUCapsPtr qemuCaps,
enum virNetDevVPortProfileOp vmop); enum virNetDevVPortProfileOp vmop);
int qemuOpenVhostNet(virDomainDefPtr def, int qemuOpenVhostNet(virDomainDefPtr def,
virDomainNetDefPtr net, virDomainNetDefPtr net,
qemuCapsPtr caps, virQEMUCapsPtr qemuCaps,
int *vhostfd); int *vhostfd);
/* /*
* NB: def->name can be NULL upon return and the caller * NB: def->name can be NULL upon return and the caller
* *must* decide how to fill in a name in this case * *must* decide how to fill in a name in this case
*/ */
virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
const char **progenv, const char **progenv,
const char **progargv, const char **progargv,
char **pidfile, char **pidfile,
virDomainChrSourceDefPtr *monConfig, virDomainChrSourceDefPtr *monConfig,
bool *monJSON); bool *monJSON);
virDomainDefPtr qemuParseCommandLineString(virCapsPtr caps, virDomainDefPtr qemuParseCommandLineString(virCapsPtr qemuCaps,
const char *args, const char *args,
char **pidfile, char **pidfile,
virDomainChrSourceDefPtr *monConfig, virDomainChrSourceDefPtr *monConfig,
bool *monJSON); bool *monJSON);
virDomainDefPtr qemuParseCommandLinePid(virCapsPtr caps, virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps,
pid_t pid, pid_t pid,
char **pidfile, char **pidfile,
virDomainChrSourceDefPtr *monConfig, virDomainChrSourceDefPtr *monConfig,
bool *monJSON); bool *monJSON);
int qemuDomainAssignAddresses(virDomainDefPtr def, int qemuDomainAssignAddresses(virDomainDefPtr def,
qemuCapsPtr caps, virQEMUCapsPtr qemuCaps,
virDomainObjPtr obj) virDomainObjPtr obj)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def, int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
int qemuDomainAssignPCIAddresses(virDomainDefPtr def, int qemuDomainAssignPCIAddresses(virDomainDefPtr def,
qemuCapsPtr caps, virQEMUCapsPtr qemuCaps,
virDomainObjPtr obj); virDomainObjPtr obj);
qemuDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def); qemuDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def);
int qemuDomainPCIAddressReserveFunction(qemuDomainPCIAddressSetPtr addrs, int qemuDomainPCIAddressReserveFunction(qemuDomainPCIAddressSetPtr addrs,
...@@ -212,15 +212,15 @@ int qemuDomainPCIAddressReleaseSlot(qemuDomainPCIAddressSetPtr addrs, int slot); ...@@ -212,15 +212,15 @@ int qemuDomainPCIAddressReleaseSlot(qemuDomainPCIAddressSetPtr addrs, int slot);
void qemuDomainPCIAddressSetFree(qemuDomainPCIAddressSetPtr addrs); void qemuDomainPCIAddressSetFree(qemuDomainPCIAddressSetPtr addrs);
int qemuAssignDevicePCISlots(virDomainDefPtr def, int qemuAssignDevicePCISlots(virDomainDefPtr def,
qemuCapsPtr caps, virQEMUCapsPtr qemuCaps,
qemuDomainPCIAddressSetPtr addrs); qemuDomainPCIAddressSetPtr addrs);
int qemuAssignDeviceAliases(virDomainDefPtr def, qemuCapsPtr caps); int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps);
int qemuDomainNetVLAN(virDomainNetDefPtr def); int qemuDomainNetVLAN(virDomainNetDefPtr def);
int qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx); int qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx);
int qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef, int qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef,
virDomainDiskDefPtr def, virDomainDiskDefPtr def,
qemuCapsPtr caps); virQEMUCapsPtr qemuCaps);
int qemuAssignDeviceHostdevAlias(virDomainDefPtr def, virDomainHostdevDefPtr hostdev, int idx); int qemuAssignDeviceHostdevAlias(virDomainDefPtr def, virDomainHostdevDefPtr hostdev, int idx);
int qemuAssignDeviceControllerAlias(virDomainControllerDefPtr controller); int qemuAssignDeviceControllerAlias(virDomainControllerDefPtr controller);
int qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, virDomainRedirdevDefPtr redirdev, int idx); int qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, virDomainRedirdevDefPtr redirdev, int idx);
......
src/qemu/qemu_conf.h
浏览文件 @ 32803ba4
...@@ -187,7 +187,7 @@ struct _virQEMUDriver { ...@@ -187,7 +187,7 @@ struct _virQEMUDriver {
virCapsPtr caps; virCapsPtr caps;
/* Immutable pointer, self-locking APIs */ /* Immutable pointer, self-locking APIs */
qemuCapsCachePtr capsCache; virQEMUCapsCachePtr qemuCapsCache;
/* Immutable pointer, self-locking APIs */ /* Immutable pointer, self-locking APIs */
virDomainEventStatePtr domainEventState; virDomainEventStatePtr domainEventState;
......
src/qemu/qemu_domain.c
浏览文件 @ 32803ba4
...@@ -231,7 +231,7 @@ static void qemuDomainObjPrivateFree(void *data) ...@@ -231,7 +231,7 @@ static void qemuDomainObjPrivateFree(void *data)
{ {
qemuDomainObjPrivatePtr priv = data; qemuDomainObjPrivatePtr priv = data;
virObjectUnref(priv->caps); virObjectUnref(priv->qemuCaps);
qemuDomainPCIAddressSetFree(priv->pciaddrs); qemuDomainPCIAddressSetFree(priv->pciaddrs);
virDomainChrSourceDefFree(priv->monConfig); virDomainChrSourceDefFree(priv->monConfig);
...@@ -291,13 +291,13 @@ static int qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) ...@@ -291,13 +291,13 @@ static int qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data)
virBufferAddLit(buf, " </vcpus>\n"); virBufferAddLit(buf, " </vcpus>\n");
} }
if (priv->caps) { if (priv->qemuCaps) {
int i; int i;
virBufferAddLit(buf, " <qemuCaps>\n"); virBufferAddLit(buf, " <qemuCaps>\n");
for (i = 0 ; i < QEMU_CAPS_LAST ; i++) { for (i = 0 ; i < QEMU_CAPS_LAST ; i++) {
if (qemuCapsGet(priv->caps, i)) { if (virQEMUCapsGet(priv->qemuCaps, i)) {
virBufferAsprintf(buf, " <flag name='%s'/>\n", virBufferAsprintf(buf, " <flag name='%s'/>\n",
qemuCapsTypeToString(i)); virQEMUCapsTypeToString(i));
} }
} }
virBufferAddLit(buf, " </qemuCaps>\n"); virBufferAddLit(buf, " </qemuCaps>\n");
...@@ -336,7 +336,7 @@ static int qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) ...@@ -336,7 +336,7 @@ static int qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data)
char *tmp; char *tmp;
int n, i; int n, i;
xmlNodePtr *nodes = NULL; xmlNodePtr *nodes = NULL;
qemuCapsPtr caps = NULL; virQEMUCapsPtr qemuCaps = NULL;
if (VIR_ALLOC(priv->monConfig) < 0) { if (VIR_ALLOC(priv->monConfig) < 0) {
virReportOOMError(); virReportOOMError();
...@@ -408,13 +408,13 @@ static int qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) ...@@ -408,13 +408,13 @@ static int qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data)
goto error; goto error;
} }
if (n > 0) { if (n > 0) {
if (!(caps = qemuCapsNew())) if (!(qemuCaps = virQEMUCapsNew()))
goto error; goto error;
for (i = 0 ; i < n ; i++) { for (i = 0 ; i < n ; i++) {
char *str = virXMLPropString(nodes[i], "name"); char *str = virXMLPropString(nodes[i], "name");
if (str) { if (str) {
int flag = qemuCapsTypeFromString(str); int flag = virQEMUCapsTypeFromString(str);
if (flag < 0) { if (flag < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown qemu capabilities flag %s"), str); _("Unknown qemu capabilities flag %s"), str);
...@@ -422,11 +422,11 @@ static int qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) ...@@ -422,11 +422,11 @@ static int qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data)
goto error; goto error;
} }
VIR_FREE(str); VIR_FREE(str);
qemuCapsSet(caps, flag); virQEMUCapsSet(qemuCaps, flag);
} }
} }
priv->caps = caps; priv->qemuCaps = qemuCaps;
} }
VIR_FREE(nodes); VIR_FREE(nodes);
...@@ -477,7 +477,7 @@ error: ...@@ -477,7 +477,7 @@ error:
virDomainChrSourceDefFree(priv->monConfig); virDomainChrSourceDefFree(priv->monConfig);
priv->monConfig = NULL; priv->monConfig = NULL;
VIR_FREE(nodes); VIR_FREE(nodes);
virObjectUnref(caps); virObjectUnref(qemuCaps);
return -1; return -1;
} }
......
src/qemu/qemu_domain.h
浏览文件 @ 32803ba4
...@@ -145,7 +145,7 @@ struct _qemuDomainObjPrivate { ...@@ -145,7 +145,7 @@ struct _qemuDomainObjPrivate {
qemuDomainPCIAddressSetPtr pciaddrs; qemuDomainPCIAddressSetPtr pciaddrs;
int persistentAddrs; int persistentAddrs;
qemuCapsPtr caps; virQEMUCapsPtr qemuCaps;
char *lockState; char *lockState;
bool fakeReboot; bool fakeReboot;
......
src/qemu/qemu_driver.c
浏览文件 @ 32803ba4
此差异已折叠。
src/qemu/qemu_hotplug.c
浏览文件 @ 32803ba4
此差异已折叠。
src/qemu/qemu_migration.c
浏览文件 @ 32803ba4
...@@ -1162,7 +1162,7 @@ qemuMigrationUpdateJobStatus(virQEMUDriverPtr driver, ...@@ -1162,7 +1162,7 @@ qemuMigrationUpdateJobStatus(virQEMUDriverPtr driver,
* migration finish until SPICE server transfers its data */ * migration finish until SPICE server transfers its data */
if (vm->def->ngraphics == 1 && if (vm->def->ngraphics == 1 &&
vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE && vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE &&
qemuCapsGet(priv->caps, QEMU_CAPS_SEAMLESS_MIGRATION)) virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION))
wait_for_spice = true; wait_for_spice = true;
ret = qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob); ret = qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob);
...@@ -2286,7 +2286,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, ...@@ -2286,7 +2286,7 @@ qemuMigrationRun(virQEMUDriverPtr driver,
break; break;
case MIGRATION_DEST_UNIX: case MIGRATION_DEST_UNIX:
if (qemuCapsGet(priv->caps, QEMU_CAPS_MIGRATE_QEMU_UNIX)) { if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_UNIX)) {
ret = qemuMonitorMigrateToUnix(priv->mon, migrate_flags, ret = qemuMonitorMigrateToUnix(priv->mon, migrate_flags,
spec->dest.unix_socket.file); spec->dest.unix_socket.file);
} else { } else {
...@@ -2441,7 +2441,7 @@ static int doNativeMigrate(virQEMUDriverPtr driver, ...@@ -2441,7 +2441,7 @@ static int doNativeMigrate(virQEMUDriverPtr driver,
if (!uribits) if (!uribits)
return -1; return -1;
if (qemuCapsGet(priv->caps, QEMU_CAPS_MIGRATE_QEMU_FD)) if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD))
spec.destType = MIGRATION_DEST_CONNECT_HOST; spec.destType = MIGRATION_DEST_CONNECT_HOST;
else else
spec.destType = MIGRATION_DEST_HOST; spec.destType = MIGRATION_DEST_HOST;
...@@ -2483,9 +2483,9 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, ...@@ -2483,9 +2483,9 @@ static int doTunnelMigrate(virQEMUDriverPtr driver,
driver, vm, st, NULLSTR(cookiein), cookieinlen, driver, vm, st, NULLSTR(cookiein), cookieinlen,
cookieout, cookieoutlen, flags, resource); cookieout, cookieoutlen, flags, resource);
if (!qemuCapsGet(priv->caps, QEMU_CAPS_MIGRATE_QEMU_FD) && if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD) &&
!qemuCapsGet(priv->caps, QEMU_CAPS_MIGRATE_QEMU_UNIX) && !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_UNIX) &&
!qemuCapsGet(priv->caps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) { !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s", virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("Source qemu is too old to support tunnelled migration")); _("Source qemu is too old to support tunnelled migration"));
virObjectUnref(cfg); virObjectUnref(cfg);
...@@ -2495,7 +2495,7 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, ...@@ -2495,7 +2495,7 @@ static int doTunnelMigrate(virQEMUDriverPtr driver,
spec.fwdType = MIGRATION_FWD_STREAM; spec.fwdType = MIGRATION_FWD_STREAM;
spec.fwd.stream = st; spec.fwd.stream = st;
if (qemuCapsGet(priv->caps, QEMU_CAPS_MIGRATE_QEMU_FD)) { if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD)) {
int fds[2]; int fds[2];
spec.destType = MIGRATION_DEST_FD; spec.destType = MIGRATION_DEST_FD;
...@@ -3623,7 +3623,7 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, ...@@ -3623,7 +3623,7 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm,
qemuDomainObjExitMonitorWithDriver(driver, vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
} }
if (qemuCapsGet(priv->caps, QEMU_CAPS_MIGRATE_QEMU_FD) && if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD) &&
(!compressor || pipe(pipeFD) == 0)) { (!compressor || pipe(pipeFD) == 0)) {
/* All right! We can use fd migration, which means that qemu /* All right! We can use fd migration, which means that qemu
* doesn't have to open() the file, so while we still have to * doesn't have to open() the file, so while we still have to
...@@ -3674,7 +3674,7 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, ...@@ -3674,7 +3674,7 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm,
if (!compressor) { if (!compressor) {
const char *args[] = { "cat", NULL }; const char *args[] = { "cat", NULL };
if (qemuCapsGet(priv->caps, QEMU_CAPS_MIGRATE_QEMU_FD) && if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD) &&
priv->monConfig->type == VIR_DOMAIN_CHR_TYPE_UNIX) { priv->monConfig->type == VIR_DOMAIN_CHR_TYPE_UNIX) {
rc = qemuMonitorMigrateToFd(priv->mon, rc = qemuMonitorMigrateToFd(priv->mon,
QEMU_MONITOR_MIGRATE_BACKGROUND, QEMU_MONITOR_MIGRATE_BACKGROUND,
......
src/qemu/qemu_process.c
浏览文件 @ 32803ba4
此差异已折叠。
tests/qemuhelptest.c
浏览文件 @ 32803ba4
此差异已折叠。
tests/qemuxml2argvtest.c
浏览文件 @ 32803ba4
此差异已折叠。
tests/qemuxmlnstest.c
浏览文件 @ 32803ba4
...@@ -25,7 +25,7 @@ static virQEMUDriver driver; ...@@ -25,7 +25,7 @@ static virQEMUDriver driver;
static int testCompareXMLToArgvFiles(const char *xml, static int testCompareXMLToArgvFiles(const char *xml,
const char *cmdline, const char *cmdline,
qemuCapsPtr extraFlags, virQEMUCapsPtr extraFlags,
const char *migrateFrom, const char *migrateFrom,
int migrateFd, int migrateFd,
bool json, bool json,
...@@ -76,7 +76,7 @@ static int testCompareXMLToArgvFiles(const char *xml, ...@@ -76,7 +76,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto fail; goto fail;
} }
if (qemuCapsGet(extraFlags, QEMU_CAPS_DOMID)) if (virQEMUCapsGet(extraFlags, QEMU_CAPS_DOMID))
vmdef->id = 6; vmdef->id = 6;
else else
vmdef->id = -1; vmdef->id = -1;
...@@ -86,13 +86,13 @@ static int testCompareXMLToArgvFiles(const char *xml, ...@@ -86,13 +86,13 @@ static int testCompareXMLToArgvFiles(const char *xml,
monitor_chr.data.nix.path = (char *)"/tmp/test-monitor"; monitor_chr.data.nix.path = (char *)"/tmp/test-monitor";
monitor_chr.data.nix.listen = true; monitor_chr.data.nix.listen = true;
qemuCapsSetList(extraFlags, virQEMUCapsSetList(extraFlags,
QEMU_CAPS_VNC_COLON, QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT, QEMU_CAPS_NO_REBOOT,
QEMU_CAPS_NO_ACPI, QEMU_CAPS_NO_ACPI,
QEMU_CAPS_LAST); QEMU_CAPS_LAST);
if (qemuCapsGet(extraFlags, QEMU_CAPS_DEVICE)) if (virQEMUCapsGet(extraFlags, QEMU_CAPS_DEVICE))
qemuDomainAssignAddresses(vmdef, extraFlags, NULL); qemuDomainAssignAddresses(vmdef, extraFlags, NULL);
log = virtTestLogContentAndReset(); log = virtTestLogContentAndReset();
...@@ -101,7 +101,7 @@ static int testCompareXMLToArgvFiles(const char *xml, ...@@ -101,7 +101,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
if (vmdef->os.arch == VIR_ARCH_X86_64 || if (vmdef->os.arch == VIR_ARCH_X86_64 ||
vmdef->os.arch == VIR_ARCH_I686) { vmdef->os.arch == VIR_ARCH_I686) {
qemuCapsSet(extraFlags, QEMU_CAPS_PCI_MULTIBUS); virQEMUCapsSet(extraFlags, QEMU_CAPS_PCI_MULTIBUS);
} }
if (qemuAssignDeviceAliases(vmdef, extraFlags) < 0) if (qemuAssignDeviceAliases(vmdef, extraFlags) < 0)
...@@ -157,7 +157,7 @@ static int testCompareXMLToArgvFiles(const char *xml, ...@@ -157,7 +157,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
struct testInfo { struct testInfo {
const char *name; const char *name;
qemuCapsPtr extraFlags; virQEMUCapsPtr extraFlags;
const char *migrateFrom; const char *migrateFrom;
int migrateFd; int migrateFd;
bool json; bool json;
...@@ -215,9 +215,9 @@ mymain(void) ...@@ -215,9 +215,9 @@ mymain(void)
struct testInfo info = { \ struct testInfo info = { \
name, NULL, migrateFrom, migrateFd, json, expectError \ name, NULL, migrateFrom, migrateFd, json, expectError \
}; \ }; \
if (!(info.extraFlags = qemuCapsNew())) \ if (!(info.extraFlags = virQEMUCapsNew())) \
return EXIT_FAILURE; \ return EXIT_FAILURE; \
qemuCapsSetList(info.extraFlags, __VA_ARGS__, QEMU_CAPS_LAST); \ virQEMUCapsSetList(info.extraFlags, __VA_ARGS__, QEMU_CAPS_LAST);\
if (virtTestRun("QEMU XML-2-ARGV " name, \ if (virtTestRun("QEMU XML-2-ARGV " name, \
1, testCompareXMLToArgvHelper, &info) < 0) \ 1, testCompareXMLToArgvHelper, &info) < 0) \
ret = -1; \ ret = -1; \
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或