openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: Save qemu driver in qemuDomainObjPrivateData 

This way we can finally make it static and not use any externs anywhere.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2017-07-21 15:46:56 +02:00
parent 6e6faf6d62
commit 2e6ecba1bc
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_domain.c
View File

@ -1662,7 +1662,7 @@ qemuDomainClearPrivatePaths(virDomainObjPtr vm)
static void * static void *
qemuDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED) qemuDomainObjPrivateAlloc(void *opaque)
{ {
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
@ -1679,6 +1679,7 @@ qemuDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
goto error; goto error;
priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX; priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX;
priv->driver = opaque;
return priv; return priv;

2
src/qemu/qemu_domain.h
View File

@ -217,6 +217,8 @@ struct _qemuDomainSecretInfo {
typedef struct _qemuDomainObjPrivate qemuDomainObjPrivate; typedef struct _qemuDomainObjPrivate qemuDomainObjPrivate;
typedef qemuDomainObjPrivate *qemuDomainObjPrivatePtr; typedef qemuDomainObjPrivate *qemuDomainObjPrivatePtr;
struct _qemuDomainObjPrivate { struct _qemuDomainObjPrivate {
virQEMUDriverPtr driver;
struct qemuDomainJobObj job; struct qemuDomainJobObj job;
virBitmapPtr namespaces; virBitmapPtr namespaces;

2
src/qemu/qemu_driver.c
View File

@ -159,7 +159,7 @@ static int qemuGetDHCPInterfaces(virDomainPtr dom,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainInterfacePtr **ifaces); virDomainInterfacePtr **ifaces);
virQEMUDriverPtr qemu_driver = NULL; static virQEMUDriverPtr qemu_driver;
static void static void

5
src/qemu/qemu_process.c
View File

@ -120,9 +120,6 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver,
} }
/* XXX figure out how to remove this */
extern virQEMUDriverPtr qemu_driver;
/* /*
* This is a callback registered with a qemuAgentPtr instance, * This is a callback registered with a qemuAgentPtr instance,
* and to be invoked when the agent console hits an end of file * and to be invoked when the agent console hits an end of file
@ -518,9 +515,9 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
static void static void
qemuProcessFakeReboot(void *opaque) qemuProcessFakeReboot(void *opaque)
{ {
virQEMUDriverPtr driver = qemu_driver;
virDomainObjPtr vm = opaque; virDomainObjPtr vm = opaque;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virQEMUDriverPtr driver = priv->driver;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
virDomainRunningReason reason = VIR_DOMAIN_RUNNING_BOOTED; virDomainRunningReason reason = VIR_DOMAIN_RUNNING_BOOTED;