mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 11:31:16 +00:00
Make qemuCmdFlags available in qemudDomainAttachDevice()
qemudDomainChangeEjectableMedia() currently extracts the qemu command line flags, but other device attaching code might need it, so move the qemudExtractVersionInfo() call up a frame. * src/qemu_driver.c: move the qemudExtractVersionInfo() call from qemudDomainChangeEjectableMedia() to qemudDomainAttachDevice()
This commit is contained in:
parent
30605477f2
commit
423af1977f
@ -4239,12 +4239,12 @@ static char *qemudDiskDeviceName(const virConnectPtr conn,
|
||||
|
||||
static int qemudDomainChangeEjectableMedia(virConnectPtr conn,
|
||||
virDomainObjPtr vm,
|
||||
virDomainDeviceDefPtr dev)
|
||||
virDomainDeviceDefPtr dev,
|
||||
unsigned int qemuCmdFlags)
|
||||
{
|
||||
virDomainDiskDefPtr origdisk = NULL, newdisk;
|
||||
char *cmd, *reply, *safe_path;
|
||||
char *devname = NULL;
|
||||
unsigned int qemuCmdFlags;
|
||||
int i;
|
||||
|
||||
origdisk = NULL;
|
||||
@ -4265,11 +4265,6 @@ static int qemudDomainChangeEjectableMedia(virConnectPtr conn,
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (qemudExtractVersionInfo(vm->def->emulator,
|
||||
NULL,
|
||||
&qemuCmdFlags) < 0)
|
||||
return -1;
|
||||
|
||||
if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE) {
|
||||
if (!(devname = qemudDiskDeviceName(conn, newdisk)))
|
||||
return -1;
|
||||
@ -4551,6 +4546,7 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
|
||||
struct qemud_driver *driver = dom->conn->privateData;
|
||||
virDomainObjPtr vm;
|
||||
virDomainDeviceDefPtr dev = NULL;
|
||||
unsigned int qemuCmdFlags;
|
||||
int ret = -1;
|
||||
|
||||
qemuDriverLock(driver);
|
||||
@ -4574,6 +4570,10 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
|
||||
if (dev == NULL)
|
||||
goto cleanup;
|
||||
|
||||
if (qemudExtractVersionInfo(vm->def->emulator,
|
||||
NULL,
|
||||
&qemuCmdFlags) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
|
||||
switch (dev->data.disk->device) {
|
||||
@ -4585,7 +4585,7 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
|
||||
if (qemuDomainSetDeviceOwnership(dom->conn, driver, dev, 0) < 0)
|
||||
goto cleanup;
|
||||
|
||||
ret = qemudDomainChangeEjectableMedia(dom->conn, vm, dev);
|
||||
ret = qemudDomainChangeEjectableMedia(dom->conn, vm, dev, qemuCmdFlags);
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_DISK_DEVICE_DISK:
|
||||
|
Loading…
Reference in New Issue
Block a user