提交 36caaddd 编写于 作者: P Peter Krempa 提交者: Eric Blake

qemu: build failed due to unused variables

While compiling on F15 build crashed (probably because of new GCC).
上级 64bd1b9d
...@@ -185,6 +185,7 @@ Patches have also been contributed by: ...@@ -185,6 +185,7 @@ Patches have also been contributed by:
Michael Santos <michael.santos@gmail.com> Michael Santos <michael.santos@gmail.com>
Alex Jia <ajia@redhat.com> Alex Jia <ajia@redhat.com>
Oskari Saarenmaa <os@ohmu.fi> Oskari Saarenmaa <os@ohmu.fi>
Peter Krempa <pkrempa@redhat.com>
[....send patches to get your name here....] [....send patches to get your name here....]
......
...@@ -1498,7 +1498,9 @@ static int qemuDomainReboot(virDomainPtr dom, unsigned int flags) { ...@@ -1498,7 +1498,9 @@ static int qemuDomainReboot(virDomainPtr dom, unsigned int flags) {
struct qemud_driver *driver = dom->conn->privateData; struct qemud_driver *driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
int ret = -1; int ret = -1;
#if HAVE_YAJL
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
#endif
virCheckFlags(0, -1); virCheckFlags(0, -1);
...@@ -1513,9 +1515,10 @@ static int qemuDomainReboot(virDomainPtr dom, unsigned int flags) { ...@@ -1513,9 +1515,10 @@ static int qemuDomainReboot(virDomainPtr dom, unsigned int flags) {
_("no domain with matching uuid '%s'"), uuidstr); _("no domain with matching uuid '%s'"), uuidstr);
goto cleanup; goto cleanup;
} }
priv = vm->privateData;
#if HAVE_YAJL #if HAVE_YAJL
priv = vm->privateData;
if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) { if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) {
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup; goto cleanup;
...@@ -2598,7 +2601,6 @@ static int qemudDomainCoreDump(virDomainPtr dom, ...@@ -2598,7 +2601,6 @@ static int qemudDomainCoreDump(virDomainPtr dom,
int resume = 0, paused = 0; int resume = 0, paused = 0;
int ret = -1; int ret = -1;
virDomainEventPtr event = NULL; virDomainEventPtr event = NULL;
qemuDomainObjPrivatePtr priv;
virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH, -1); virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH, -1);
...@@ -2612,7 +2614,6 @@ static int qemudDomainCoreDump(virDomainPtr dom, ...@@ -2612,7 +2614,6 @@ static int qemudDomainCoreDump(virDomainPtr dom,
_("no domain with matching uuid '%s'"), uuidstr); _("no domain with matching uuid '%s'"), uuidstr);
goto cleanup; goto cleanup;
} }
priv = vm->privateData;
if (qemuDomainObjBeginAsyncJobWithDriver(driver, vm, if (qemuDomainObjBeginAsyncJobWithDriver(driver, vm,
QEMU_ASYNC_JOB_DUMP) < 0) QEMU_ASYNC_JOB_DUMP) < 0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册