Skip to content

L
libvirt

openeuler / libvirt

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

Remove probing of flags when launching QEMU guests 

Remove all use of the existing APIs for querying QEMU
capability flags. Instead obtain a qemuCapsPtr object
from the global cache. This avoids the execution of
'qemu -help' (and related commands) when launching new
guests.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 494e2f5c
隐藏空白更改
内联 并排
Showing with 81 addition and 202 deletion
src/qemu/qemu_capabilities.c
浏览文件 @ 15ee6614
...@@ -1471,79 +1471,6 @@ qemuCapsParseDeviceStr(const char *str, qemuCapsPtr caps) ...@@ -1471,79 +1471,6 @@ qemuCapsParseDeviceStr(const char *str, qemuCapsPtr caps)
return 0; return 0;
} }
int qemuCapsExtractVersionInfo(const char *qemu,
const char *arch,
bool check_yajl,
unsigned int *retversion,
qemuCapsPtr *retcaps)
{
int ret = -1;
unsigned int version, is_kvm, kvm_version;
qemuCapsPtr caps = NULL;
char *help = NULL;
virCommandPtr cmd;
if (retcaps)
*retcaps = NULL;
if (retversion)
*retversion = 0;
/* Make sure the binary we are about to try exec'ing exists.
* Technically we could catch the exec() failure, but that's
* in a sub-process so it's hard to feed back a useful error.
*/
if (!virFileIsExecutable(qemu)) {
virReportSystemError(errno, _("Cannot find QEMU binary %s"), qemu);
return -1;
}
cmd = qemuCapsProbeCommand(qemu, NULL);
virCommandAddArgList(cmd, "-help", NULL);
virCommandSetOutputBuffer(cmd, &help);
if (virCommandRun(cmd, NULL) < 0)
goto cleanup;
if (!(caps = qemuCapsNew()) ||
qemuCapsParseHelpStr(qemu, help, caps,
&version, &is_kvm, &kvm_version,
check_yajl) == -1)
goto cleanup;
/* Currently only x86_64 and i686 support PCI-multibus. */
if (STREQLEN(arch, "x86_64", 6) ||
STREQLEN(arch, "i686", 4)) {
qemuCapsSet(caps, QEMU_CAPS_PCI_MULTIBUS);
}
/* S390 and probably other archs do not support no-acpi -
maybe the qemu option parsing should be re-thought. */
if (STRPREFIX(arch, "s390"))
qemuCapsClear(caps, QEMU_CAPS_NO_ACPI);
/* qemuCapsExtractDeviceStr will only set additional caps if qemu
* understands the 0.13.0+ notion of "-device driver,". */
if (qemuCapsGet(caps, QEMU_CAPS_DEVICE) &&
strstr(help, "-device driver,?") &&
qemuCapsExtractDeviceStr(qemu, caps) < 0)
goto cleanup;
if (retversion)
*retversion = version;
if (retcaps) {
*retcaps = caps;
caps = NULL;
}
ret = 0;
cleanup:
VIR_FREE(help);
virCommandFree(cmd);
virObjectUnref(caps);
return ret;
}
static void static void
uname_normalize (struct utsname *ut) uname_normalize (struct utsname *ut)
...@@ -1559,12 +1486,13 @@ uname_normalize (struct utsname *ut) ...@@ -1559,12 +1486,13 @@ uname_normalize (struct utsname *ut)
ut->machine[1] = '6'; ut->machine[1] = '6';
} }
int qemuCapsExtractVersion(virCapsPtr caps, int qemuCapsGetDefaultVersion(virCapsPtr caps,
unsigned int *version) qemuCapsCachePtr capsCache,
unsigned int *version)
{ {
const char *binary; const char *binary;
struct stat sb;
struct utsname ut; struct utsname ut;
qemuCapsPtr qemucaps;
if (*version > 0) if (*version > 0)
return 0; return 0;
...@@ -1579,17 +1507,11 @@ int qemuCapsExtractVersion(virCapsPtr caps, ...@@ -1579,17 +1507,11 @@ int qemuCapsExtractVersion(virCapsPtr caps,
return -1; return -1;
} }
if (stat(binary, &sb) < 0) { if (!(qemucaps = qemuCapsCacheLookup(capsCache, binary)))
virReportSystemError(errno,
_("Cannot find QEMU binary %s"), binary);
return -1;
}
if (qemuCapsExtractVersionInfo(binary, ut.machine, false,
version, NULL) < 0) {
return -1; return -1;
}
*version = qemuCapsGetVersion(qemucaps);
virObjectUnref(qemucaps);
return 0; return 0;
} }
......
src/qemu/qemu_capabilities.h
浏览文件 @ 15ee6614
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
# include "virobject.h" # include "virobject.h"
# include "capabilities.h" # include "capabilities.h"
# include "command.h" # include "command.h"
# include "virobject.h"
/* Internal flags to keep track of qemu command line capabilities */ /* Internal flags to keep track of qemu command line capabilities */
enum qemuCapsFlags { enum qemuCapsFlags {
...@@ -211,13 +212,9 @@ int qemuCapsProbeCPUModels(const char *qemu, ...@@ -211,13 +212,9 @@ int qemuCapsProbeCPUModels(const char *qemu,
size_t *count, size_t *count,
const char ***cpus); const char ***cpus);
int qemuCapsExtractVersion(virCapsPtr caps, int qemuCapsGetDefaultVersion(virCapsPtr caps,
unsigned int *version); qemuCapsCachePtr capsCache,
int qemuCapsExtractVersionInfo(const char *qemu, unsigned int *version);
const char *arch,
bool check_yajl,
unsigned int *version,
qemuCapsPtr *retcaps);
int qemuCapsParseHelpStr(const char *qemu, int qemuCapsParseHelpStr(const char *qemu,
const char *str, const char *str,
......
src/qemu/qemu_command.c
浏览文件 @ 15ee6614
...@@ -810,33 +810,13 @@ qemuDomainPrimeS390VirtioDevices(virDomainDefPtr def, ...@@ -810,33 +810,13 @@ qemuDomainPrimeS390VirtioDevices(virDomainDefPtr def,
} }
static int static void
qemuDomainAssignS390Addresses(virDomainDefPtr def, qemuCapsPtr caps) qemuDomainAssignS390Addresses(virDomainDefPtr def, qemuCapsPtr caps)
{ {
int ret = -1; /* deal with legacy virtio-s390 */
qemuCapsPtr localCaps = NULL; if (qemuCapsGet(caps, QEMU_CAPS_VIRTIO_S390))
if (!caps) {
/* need to get information from real environment */
if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch,
false, NULL,
&localCaps) < 0)
goto cleanup;
caps = localCaps;
}
if (qemuCapsGet(caps, QEMU_CAPS_VIRTIO_S390)) {
/* deal with legacy virtio-s390 */
qemuDomainPrimeS390VirtioDevices( qemuDomainPrimeS390VirtioDevices(
def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390); def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390);
}
ret = 0;
cleanup:
virObjectUnref(localCaps);
return ret;
} }
static int static int
...@@ -863,7 +843,7 @@ qemuAssignSpaprVIOAddress(virDomainDefPtr def, virDomainDeviceInfoPtr info, ...@@ -863,7 +843,7 @@ qemuAssignSpaprVIOAddress(virDomainDefPtr def, virDomainDeviceInfoPtr info,
unsigned long long default_reg) unsigned long long default_reg)
{ {
bool user_reg; bool user_reg;
int rc; int ret;
if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO)
return 0; return 0;
...@@ -875,8 +855,8 @@ qemuAssignSpaprVIOAddress(virDomainDefPtr def, virDomainDeviceInfoPtr info, ...@@ -875,8 +855,8 @@ qemuAssignSpaprVIOAddress(virDomainDefPtr def, virDomainDeviceInfoPtr info,
info->addr.spaprvio.has_reg = true; info->addr.spaprvio.has_reg = true;
} }
rc = virDomainDeviceInfoIterate(def, qemuSpaprVIOFindByReg, info); ret = virDomainDeviceInfoIterate(def, qemuSpaprVIOFindByReg, info);
while (rc != 0) { while (ret != 0) {
if (user_reg) { if (user_reg) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("spapr-vio address %#llx already in use"), _("spapr-vio address %#llx already in use"),
...@@ -886,7 +866,7 @@ qemuAssignSpaprVIOAddress(virDomainDefPtr def, virDomainDeviceInfoPtr info, ...@@ -886,7 +866,7 @@ qemuAssignSpaprVIOAddress(virDomainDefPtr def, virDomainDeviceInfoPtr info,
/* We assigned the reg, so try a new value */ /* We assigned the reg, so try a new value */
info->addr.spaprvio.reg += 0x1000; info->addr.spaprvio.reg += 0x1000;
rc = virDomainDeviceInfoIterate(def, qemuSpaprVIOFindByReg, info); ret = virDomainDeviceInfoIterate(def, qemuSpaprVIOFindByReg, info);
} }
return 0; return 0;
...@@ -895,45 +875,32 @@ qemuAssignSpaprVIOAddress(virDomainDefPtr def, virDomainDeviceInfoPtr info, ...@@ -895,45 +875,32 @@ qemuAssignSpaprVIOAddress(virDomainDefPtr def, virDomainDeviceInfoPtr info,
int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def, int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
qemuCapsPtr caps) qemuCapsPtr caps)
{ {
int i, rc = -1; int i, ret = -1;
int model; int model;
qemuCapsPtr localCaps = NULL;
/* Default values match QEMU. See spapr_(llan|vscsi|vty).c */ /* Default values match QEMU. See spapr_(llan|vscsi|vty).c */
if (!caps) {
/* need to get information from real environment */
if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch,
false, NULL,
&localCaps) < 0)
goto cleanup;
caps = localCaps;
}
for (i = 0 ; i < def->nnets; i++) { for (i = 0 ; i < def->nnets; i++) {
if (def->nets[i]->model && if (def->nets[i]->model &&
STREQ(def->nets[i]->model, "spapr-vlan")) STREQ(def->nets[i]->model, "spapr-vlan"))
def->nets[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; def->nets[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
rc = qemuAssignSpaprVIOAddress(def, &def->nets[i]->info, if (qemuAssignSpaprVIOAddress(def, &def->nets[i]->info,
0x1000ul); 0x1000ul) < 0)
if (rc)
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < def->ncontrollers; i++) { for (i = 0 ; i < def->ncontrollers; i++) {
model = def->controllers[i]->model; model = def->controllers[i]->model;
if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) {
rc = qemuSetScsiControllerModel(def, caps, &model); if (qemuSetScsiControllerModel(def, caps, &model) < 0)
if (rc)
goto cleanup; goto cleanup;
} }
if (model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI && if (model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI &&
def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI)
def->controllers[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; def->controllers[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
rc = qemuAssignSpaprVIOAddress(def, &def->controllers[i]->info, if (qemuAssignSpaprVIOAddress(def, &def->controllers[i]->info,
0x2000ul); 0x2000ul) < 0)
if (rc)
goto cleanup; goto cleanup;
} }
...@@ -943,19 +910,17 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def, ...@@ -943,19 +910,17 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
STREQ(def->os.arch, "ppc64") && STREQ(def->os.arch, "ppc64") &&
STREQ(def->os.machine, "pseries")) STREQ(def->os.machine, "pseries"))
def->serials[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; def->serials[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
rc = qemuAssignSpaprVIOAddress(def, &def->serials[i]->info, if (qemuAssignSpaprVIOAddress(def, &def->serials[i]->info,
0x30000000ul); 0x30000000ul) < 0)
if (rc)
goto cleanup; goto cleanup;
} }
/* No other devices are currently supported on spapr-vio */ /* No other devices are currently supported on spapr-vio */
rc = 0; ret = 0;
cleanup: cleanup:
virObjectUnref(localCaps); return ret;
return rc;
} }
#define QEMU_PCI_ADDRESS_LAST_SLOT 31 #define QEMU_PCI_ADDRESS_LAST_SLOT 31
...@@ -1070,20 +1035,9 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, ...@@ -1070,20 +1035,9 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
virDomainObjPtr obj) virDomainObjPtr obj)
{ {
int ret = -1; int ret = -1;
qemuCapsPtr localCaps = NULL;
qemuDomainPCIAddressSetPtr addrs = NULL; qemuDomainPCIAddressSetPtr addrs = NULL;
qemuDomainObjPrivatePtr priv = NULL; qemuDomainObjPrivatePtr priv = NULL;
if (!caps) {
/* need to get information from real environment */
if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch,
false,
NULL,
&localCaps) < 0)
goto cleanup;
caps = localCaps;
}
if (qemuCapsGet(caps, QEMU_CAPS_DEVICE)) { if (qemuCapsGet(caps, QEMU_CAPS_DEVICE)) {
if (!(addrs = qemuDomainPCIAddressSetCreate(def))) if (!(addrs = qemuDomainPCIAddressSetCreate(def)))
goto cleanup; goto cleanup;
...@@ -1108,7 +1062,6 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, ...@@ -1108,7 +1062,6 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
ret = 0; ret = 0;
cleanup: cleanup:
virObjectUnref(localCaps);
qemuDomainPCIAddressSetFree(addrs); qemuDomainPCIAddressSetFree(addrs);
return ret; return ret;
...@@ -1124,9 +1077,7 @@ int qemuDomainAssignAddresses(virDomainDefPtr def, ...@@ -1124,9 +1077,7 @@ int qemuDomainAssignAddresses(virDomainDefPtr def,
if (rc) if (rc)
return rc; return rc;
rc = qemuDomainAssignS390Addresses(def, caps); qemuDomainAssignS390Addresses(def, caps);
if (rc)
return rc;
return qemuDomainAssignPCIAddresses(def, caps, obj); return qemuDomainAssignPCIAddresses(def, caps, obj);
} }
......
src/qemu/qemu_command.h
浏览文件 @ 15ee6614
...@@ -188,7 +188,8 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr caps, ...@@ -188,7 +188,8 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr caps,
int qemuDomainAssignAddresses(virDomainDefPtr def, int qemuDomainAssignAddresses(virDomainDefPtr def,
qemuCapsPtr caps, qemuCapsPtr caps,
virDomainObjPtr); virDomainObjPtr obj)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def, int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
qemuCapsPtr caps); qemuCapsPtr caps);
......
src/qemu/qemu_driver.c
浏览文件 @ 15ee6614
...@@ -1475,7 +1475,9 @@ static int qemudGetVersion(virConnectPtr conn, unsigned long *version) { ...@@ -1475,7 +1475,9 @@ static int qemudGetVersion(virConnectPtr conn, unsigned long *version) {
int ret = -1; int ret = -1;
qemuDriverLock(driver); qemuDriverLock(driver);
if (qemuCapsExtractVersion(driver->caps, &driver->qemuVersion) < 0) if (qemuCapsGetDefaultVersion(driver->caps,
driver->capsCache,
&driver->qemuVersion) < 0)
goto cleanup; goto cleanup;
*version = driver->qemuVersion; *version = driver->qemuVersion;
...@@ -1517,6 +1519,7 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, ...@@ -1517,6 +1519,7 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml,
virDomainEventPtr event = NULL; virDomainEventPtr event = NULL;
virDomainEventPtr event2 = NULL; virDomainEventPtr event2 = NULL;
unsigned int start_flags = VIR_QEMU_PROCESS_START_COLD; unsigned int start_flags = VIR_QEMU_PROCESS_START_COLD;
qemuCapsPtr caps = NULL;
virCheckFlags(VIR_DOMAIN_START_PAUSED | virCheckFlags(VIR_DOMAIN_START_PAUSED |
VIR_DOMAIN_START_AUTODESTROY, NULL); VIR_DOMAIN_START_AUTODESTROY, NULL);
...@@ -1538,10 +1541,13 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, ...@@ -1538,10 +1541,13 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml,
if (virDomainObjIsDuplicate(&driver->domains, def, 1) < 0) if (virDomainObjIsDuplicate(&driver->domains, def, 1) < 0)
goto cleanup; goto cleanup;
if (!(caps = qemuCapsCacheLookup(driver->capsCache, def->emulator)))
goto cleanup;
if (qemudCanonicalizeMachine(driver, def) < 0) if (qemudCanonicalizeMachine(driver, def) < 0)
goto cleanup; goto cleanup;
if (qemuDomainAssignAddresses(def, NULL, NULL) < 0) if (qemuDomainAssignAddresses(def, caps, NULL) < 0)
goto cleanup; goto cleanup;
if (!(vm = virDomainAssignDef(driver->caps, if (!(vm = virDomainAssignDef(driver->caps,
...@@ -1595,6 +1601,7 @@ cleanup: ...@@ -1595,6 +1601,7 @@ cleanup:
if (event2) if (event2)
qemuDomainEventQueue(driver, event2); qemuDomainEventQueue(driver, event2);
} }
virObjectUnref(caps);
qemuDriverUnlock(driver); qemuDriverUnlock(driver);
return dom; return dom;
} }
...@@ -5208,6 +5215,9 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, ...@@ -5208,6 +5215,9 @@ static char *qemuDomainXMLToNative(virConnectPtr conn,
if (!def) if (!def)
goto cleanup; goto cleanup;
if (!(caps = qemuCapsCacheLookup(driver->capsCache, def->emulator)))
goto cleanup;
/* Since we're just exporting args, we can't do bridge/network/direct /* Since we're just exporting args, we can't do bridge/network/direct
* setups, since libvirt will normally create TAP/macvtap devices * setups, since libvirt will normally create TAP/macvtap devices
* directly. We convert those configs into generic 'ethernet' * directly. We convert those configs into generic 'ethernet'
...@@ -5276,12 +5286,6 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, ...@@ -5276,12 +5286,6 @@ static char *qemuDomainXMLToNative(virConnectPtr conn,
net->info.bootIndex = bootIndex; net->info.bootIndex = bootIndex;
} }
if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch,
false,
NULL,
&caps) < 0)
goto cleanup;
monitor_json = qemuCapsGet(caps, QEMU_CAPS_MONITOR_JSON); monitor_json = qemuCapsGet(caps, QEMU_CAPS_MONITOR_JSON);
if (qemuProcessPrepareMonitorChr(driver, &monConfig, def->name) < 0) if (qemuProcessPrepareMonitorChr(driver, &monConfig, def->name) < 0)
...@@ -5575,6 +5579,7 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) { ...@@ -5575,6 +5579,7 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) {
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virDomainEventPtr event = NULL; virDomainEventPtr event = NULL;
qemuCapsPtr caps = NULL;
int dupVM; int dupVM;
qemuDriverLock(driver); qemuDriverLock(driver);
...@@ -5589,10 +5594,13 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) { ...@@ -5589,10 +5594,13 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) {
if ((dupVM = virDomainObjIsDuplicate(&driver->domains, def, 0)) < 0) if ((dupVM = virDomainObjIsDuplicate(&driver->domains, def, 0)) < 0)
goto cleanup; goto cleanup;
if (!(caps = qemuCapsCacheLookup(driver->capsCache, def->emulator)))
goto cleanup;
if (qemudCanonicalizeMachine(driver, def) < 0) if (qemudCanonicalizeMachine(driver, def) < 0)
goto cleanup; goto cleanup;
if (qemuDomainAssignAddresses(def, NULL, NULL) < 0) if (qemuDomainAssignAddresses(def, caps, NULL) < 0)
goto cleanup; goto cleanup;
/* We need to differentiate two cases: /* We need to differentiate two cases:
...@@ -5655,6 +5663,7 @@ cleanup: ...@@ -5655,6 +5663,7 @@ cleanup:
virDomainObjUnlock(vm); virDomainObjUnlock(vm);
if (event) if (event)
qemuDomainEventQueue(driver, event); qemuDomainEventQueue(driver, event);
virObjectUnref(caps);
qemuDriverUnlock(driver); qemuDriverUnlock(driver);
return dom; return dom;
} }
...@@ -6073,7 +6082,8 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm, ...@@ -6073,7 +6082,8 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm,
} }
static int static int
qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, qemuDomainAttachDeviceConfig(qemuCapsPtr caps,
virDomainDefPtr vmdef,
virDomainDeviceDefPtr dev) virDomainDeviceDefPtr dev)
{ {
virDomainDiskDefPtr disk; virDomainDiskDefPtr disk;
...@@ -6099,7 +6109,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, ...@@ -6099,7 +6109,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO)
if (virDomainDefAddImplicitControllers(vmdef) < 0) if (virDomainDefAddImplicitControllers(vmdef) < 0)
return -1; return -1;
if (qemuDomainAssignAddresses(vmdef, NULL, NULL) < 0) if (qemuDomainAssignAddresses(vmdef, caps, NULL) < 0)
return -1; return -1;
break; break;
...@@ -6118,7 +6128,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, ...@@ -6118,7 +6128,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
return -1; return -1;
} }
dev->data.net = NULL; dev->data.net = NULL;
if (qemuDomainAssignAddresses(vmdef, NULL, NULL) < 0) if (qemuDomainAssignAddresses(vmdef, caps, NULL) < 0)
return -1; return -1;
break; break;
...@@ -6134,7 +6144,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, ...@@ -6134,7 +6144,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
return -1; return -1;
} }
dev->data.hostdev = NULL; dev->data.hostdev = NULL;
if (qemuDomainAssignAddresses(vmdef, NULL, NULL) < 0) if (qemuDomainAssignAddresses(vmdef, caps, NULL) < 0)
return -1; return -1;
break; break;
...@@ -6166,7 +6176,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, ...@@ -6166,7 +6176,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
return -1; return -1;
dev->data.controller = NULL; dev->data.controller = NULL;
if (qemuDomainAssignAddresses(vmdef, NULL, NULL) < 0) if (qemuDomainAssignAddresses(vmdef, caps, NULL) < 0)
return -1; return -1;
break; break;
...@@ -6259,7 +6269,8 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, ...@@ -6259,7 +6269,8 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
} }
static int static int
qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, qemuDomainUpdateDeviceConfig(qemuCapsPtr caps,
virDomainDefPtr vmdef,
virDomainDeviceDefPtr dev) virDomainDeviceDefPtr dev)
{ {
virDomainDiskDefPtr orig, disk; virDomainDiskDefPtr orig, disk;
...@@ -6319,7 +6330,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, ...@@ -6319,7 +6330,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef,
vmdef->nets[pos] = net; vmdef->nets[pos] = net;
dev->data.net = NULL; dev->data.net = NULL;
if (qemuDomainAssignAddresses(vmdef, NULL, NULL) < 0) if (qemuDomainAssignAddresses(vmdef, caps, NULL) < 0)
return -1; return -1;
break; break;
...@@ -6350,6 +6361,8 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, ...@@ -6350,6 +6361,8 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml,
bool force = (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) != 0; bool force = (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) != 0;
int ret = -1; int ret = -1;
unsigned int affect; unsigned int affect;
qemuCapsPtr caps = NULL;
qemuDomainObjPrivatePtr priv;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_AFFECT_CONFIG |
...@@ -6367,6 +6380,7 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, ...@@ -6367,6 +6380,7 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml,
_("no domain with matching uuid '%s'"), uuidstr); _("no domain with matching uuid '%s'"), uuidstr);
goto cleanup; goto cleanup;
} }
priv = vm->privateData;
if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup; goto cleanup;
...@@ -6408,6 +6422,11 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, ...@@ -6408,6 +6422,11 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml,
goto endjob; goto endjob;
} }
if (priv->caps)
caps = virObjectRef(priv->caps);
else if (!(caps = qemuCapsCacheLookup(driver->capsCache, vm->def->emulator)))
goto cleanup;
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
if (virDomainDefCompatibleDevice(vm->def, dev) < 0) if (virDomainDefCompatibleDevice(vm->def, dev) < 0)
goto endjob; goto endjob;
...@@ -6418,13 +6437,13 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, ...@@ -6418,13 +6437,13 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml,
goto endjob; goto endjob;
switch (action) { switch (action) {
case QEMU_DEVICE_ATTACH: case QEMU_DEVICE_ATTACH:
ret = qemuDomainAttachDeviceConfig(vmdef, dev); ret = qemuDomainAttachDeviceConfig(caps, vmdef, dev);
break; break;
case QEMU_DEVICE_DETACH: case QEMU_DEVICE_DETACH:
ret = qemuDomainDetachDeviceConfig(vmdef, dev); ret = qemuDomainDetachDeviceConfig(vmdef, dev);
break; break;
case QEMU_DEVICE_UPDATE: case QEMU_DEVICE_UPDATE:
ret = qemuDomainUpdateDeviceConfig(vmdef, dev); ret = qemuDomainUpdateDeviceConfig(caps, vmdef, dev);
break; break;
default: default:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
...@@ -6484,6 +6503,7 @@ endjob: ...@@ -6484,6 +6503,7 @@ endjob:
vm = NULL; vm = NULL;
cleanup: cleanup:
virObjectUnref(caps);
virDomainDefFree(vmdef); virDomainDefFree(vmdef);
if (dev != dev_copy) if (dev != dev_copy)
virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev_copy);
...@@ -12260,6 +12280,7 @@ static virDomainPtr qemuDomainAttach(virConnectPtr conn, ...@@ -12260,6 +12280,7 @@ static virDomainPtr qemuDomainAttach(virConnectPtr conn,
bool monJSON = false; bool monJSON = false;
pid_t pid = pid_value; pid_t pid = pid_value;
char *pidfile = NULL; char *pidfile = NULL;
qemuCapsPtr caps = NULL;
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
...@@ -12289,13 +12310,16 @@ static virDomainPtr qemuDomainAttach(virConnectPtr conn, ...@@ -12289,13 +12310,16 @@ static virDomainPtr qemuDomainAttach(virConnectPtr conn,
goto cleanup; goto cleanup;
} }
if (!(caps = qemuCapsCacheLookup(driver->capsCache, def->emulator)))
goto cleanup;
if (virDomainObjIsDuplicate(&driver->domains, def, 1) < 0) if (virDomainObjIsDuplicate(&driver->domains, def, 1) < 0)
goto cleanup; goto cleanup;
if (qemudCanonicalizeMachine(driver, def) < 0) if (qemudCanonicalizeMachine(driver, def) < 0)
goto cleanup; goto cleanup;
if (qemuDomainAssignAddresses(def, NULL, NULL) < 0) if (qemuDomainAssignAddresses(def, caps, NULL) < 0)
goto cleanup; goto cleanup;
if (!(vm = virDomainAssignDef(driver->caps, if (!(vm = virDomainAssignDef(driver->caps,
...@@ -12327,6 +12351,7 @@ endjob: ...@@ -12327,6 +12351,7 @@ endjob:
cleanup: cleanup:
virDomainDefFree(def); virDomainDefFree(def);
virObjectUnref(caps);
virDomainChrSourceDefFree(monConfig); virDomainChrSourceDefFree(monConfig);
if (vm) if (vm)
virDomainObjUnlock(vm); virDomainObjUnlock(vm);
......
src/qemu/qemu_process.c
浏览文件 @ 15ee6614
...@@ -3092,10 +3092,8 @@ qemuProcessReconnect(void *opaque) ...@@ -3092,10 +3092,8 @@ qemuProcessReconnect(void *opaque)
* caps in the domain status, so re-query them * caps in the domain status, so re-query them
*/ */
if (!priv->caps && if (!priv->caps &&
qemuCapsExtractVersionInfo(obj->def->emulator, obj->def->os.arch, !(priv->caps = qemuCapsCacheLookupCopy(driver->capsCache,
false, obj->def->emulator)))
NULL,
&priv->caps) < 0)
goto error; goto error;
/* In case the domain shutdown while we were not running, /* In case the domain shutdown while we were not running,
...@@ -3492,11 +3490,8 @@ int qemuProcessStart(virConnectPtr conn, ...@@ -3492,11 +3490,8 @@ int qemuProcessStart(virConnectPtr conn,
VIR_DEBUG("Determining emulator version"); VIR_DEBUG("Determining emulator version");
virObjectUnref(priv->caps); virObjectUnref(priv->caps);
priv->caps = NULL; if (!(priv->caps = qemuCapsCacheLookupCopy(driver->capsCache,
if (qemuCapsExtractVersionInfo(vm->def->emulator, vm->def->os.arch, vm->def->emulator)))
true,
NULL,
&priv->caps) < 0)
goto cleanup; goto cleanup;
if (qemuAssignDeviceAliases(vm->def, priv->caps) < 0) if (qemuAssignDeviceAliases(vm->def, priv->caps) < 0)
...@@ -4206,12 +4201,8 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -4206,12 +4201,8 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED,
VIR_DEBUG("Determining emulator version"); VIR_DEBUG("Determining emulator version");
virObjectUnref(priv->caps); virObjectUnref(priv->caps);
priv->caps = NULL; if (!(priv->caps = qemuCapsCacheLookupCopy(driver->capsCache,
if (qemuCapsExtractVersionInfo(vm->def->emulator, vm->def->emulator)))
vm->def->os.arch,
false,
NULL,
&priv->caps) < 0)
goto cleanup; goto cleanup;
VIR_DEBUG("Preparing monitor state"); VIR_DEBUG("Preparing monitor state");
......
tests/qemuxml2argvtest.c
浏览文件 @ 15ee6614
...@@ -157,10 +157,6 @@ static int testCompareXMLToArgvFiles(const char *xml, ...@@ -157,10 +157,6 @@ static int testCompareXMLToArgvFiles(const char *xml,
VIR_FREE(log); VIR_FREE(log);
virResetLastError(); virResetLastError();
/* We do not call qemuCapsExtractVersionInfo() before calling
* qemuBuildCommandLine(), so we should set QEMU_CAPS_PCI_MULTIBUS for
* x86_64 and i686 architectures here.
*/
if (STREQLEN(vmdef->os.arch, "x86_64", 6) || if (STREQLEN(vmdef->os.arch, "x86_64", 6) ||
STREQLEN(vmdef->os.arch, "i686", 4)) { STREQLEN(vmdef->os.arch, "i686", 4)) {
qemuCapsSet(extraFlags, QEMU_CAPS_PCI_MULTIBUS); qemuCapsSet(extraFlags, QEMU_CAPS_PCI_MULTIBUS);
......
tests/qemuxmlnstest.c
浏览文件 @ 15ee6614
...@@ -102,10 +102,6 @@ static int testCompareXMLToArgvFiles(const char *xml, ...@@ -102,10 +102,6 @@ static int testCompareXMLToArgvFiles(const char *xml,
VIR_FREE(log); VIR_FREE(log);
virResetLastError(); virResetLastError();
/* We do not call qemuCapsExtractVersionInfo() before calling
* qemuBuildCommandLine(), so we should set QEMU_CAPS_PCI_MULTIBUS for
* x86_64 and i686 architectures here.
*/
if (STREQLEN(vmdef->os.arch, "x86_64", 6) || if (STREQLEN(vmdef->os.arch, "x86_64", 6) ||
STREQLEN(vmdef->os.arch, "i686", 4)) { STREQLEN(vmdef->os.arch, "i686", 4)) {
qemuCapsSet(extraFlags, QEMU_CAPS_PCI_MULTIBUS); qemuCapsSet(extraFlags, QEMU_CAPS_PCI_MULTIBUS);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或