5:52 a.m.
---
src/parallels/parallels_sdk.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
index d0d2ce2..3bb2ce8 100644
--- a/src/parallels/parallels_sdk.c
+++ b/src/parallels/parallels_sdk.c
@@ -2804,23 +2804,23 @@ prlsdkDoApplyConfig(PRL_HANDLE sdkdom,
goto error;
for (i = 0; i < def->nserials; i++) {
- if (prlsdkAddSerial(sdkdom, def->serials[i]) < 0)
- goto error;
+ if (prlsdkAddSerial(sdkdom, def->serials[i]) < 0)
+ goto error;
}
for (i = 0; i < def->nnets; i++) {
- if (prlsdkAddNet(sdkdom, def->nets[i]) < 0)
- goto error;
+ if (prlsdkAddNet(sdkdom, def->nets[i]) < 0)
+ goto error;
}
for (i = 0; i < def->ndisks; i++) {
- if (prlsdkAddDisk(sdkdom, def->disks[i]) < 0)
- goto error;
+ if (prlsdkAddDisk(sdkdom, def->disks[i]) < 0)
+ goto error;
}
for (i = 0; i < def->nfss; i++) {
- if (prlsdkAddFS(sdkdom, def->fss[i]) < 0)
- goto error;
+ if (prlsdkAddFS(sdkdom, def->fss[i]) < 0)
+ goto error;
}
return 0;
--
1.7.1
5:52 a.m.
New subject: [libvirt] [PATCH 2/3] parallels: Use IS_CT() macro instead of STREQ("exe")
---
src/parallels/parallels_sdk.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
index 3bb2ce8..8660259 100644
--- a/src/parallels/parallels_sdk.c
+++ b/src/parallels/parallels_sdk.c
@@ -1865,8 +1865,8 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr
def)
return -1;
}
- if (!(vmType == PVT_VM && STREQ(def->os.type, "hvm"))
&&
- !(vmType == PVT_CT && STREQ(def->os.type, "exe"))) {
+ if (!(vmType == PVT_VM && !IS_CT(def)) &&
+ !(vmType == PVT_CT && IS_CT(def))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("changing OS type is not supported "
@@ -1874,7 +1874,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr
def)
return -1;
}
- if (STREQ(def->os.type, "hvm")) {
+ if (!IS_CT(def)) {
if (def->os.nBootDevs != 1 ||
def->os.bootDevs[0] != VIR_DOMAIN_BOOT_DISK ||
def->os.init != NULL || def->os.initargv != NULL) {
@@ -2072,10 +2072,9 @@ static int prlsdkCheckGraphicsUnsupportedParams(virDomainDefPtr
def)
static int prlsdkCheckVideoUnsupportedParams(virDomainDefPtr def)
{
- bool isCt = STREQ(def->os.type, "exe");
virDomainVideoDefPtr v;
- if (isCt) {
+ if (IS_CT(def)) {
if (def->nvideos == 0) {
return 0;
} else {
--
1.7.1
5:52 a.m.
New subject: [libvirt] [PATCH 3/3] parallels: Set the first HDD from XML as bootable
1. Delete all boot devices for VM instance
2. Find the first HDD from XML and set it as bootable
Now we support only one boot device and it should be HDD
---
src/parallels/parallels_sdk.c | 95 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 91 insertions(+), 4 deletions(-)
diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
index 8660259..15822ab 100644
--- a/src/parallels/parallels_sdk.c
+++ b/src/parallels/parallels_sdk.c
@@ -1987,6 +1987,69 @@ static int prlsdkClearDevices(PRL_HANDLE sdkdom)
return ret;
}
+int
+prlsdkRemoveBootDevices(PRL_HANDLE sdkdom)
+{
+ PRL_RESULT pret;
+ PRL_UINT32 devCount;
+ PRL_HANDLE dev = PRL_INVALID_HANDLE;
+ PRL_DEVICE_TYPE devType;
+
+ pret = PrlVmCfg_GetBootDevCount(sdkdom, &devCount);
+ prlsdkCheckRetGoto(pret, error);
+
+ for (int i = 0; i < devCount; i++) {
+
+ /* always get device by index 0, because device list resort after delete */
+ pret = PrlVmCfg_GetBootDev(sdkdom, 0, &dev);
+ prlsdkCheckRetGoto(pret, error);
+
+ pret = PrlBootDev_GetType(dev, &devType);
+ prlsdkCheckRetGoto(pret, error);
+
+ pret = PrlBootDev_Remove(dev);
+ prlsdkCheckRetGoto(pret, error);
+ }
+
+ return 0;
+
+ error:
+ return -1;
+}
+
+int
+prlsdkAddDeviceToBootList(PRL_HANDLE sdkdom,
+ PRL_UINT32 devIndex,
+ PRL_DEVICE_TYPE devType,
+ PRL_UINT32 bootSequence)
+{
+ PRL_RESULT pret;
+ PRL_HANDLE bootDev = PRL_INVALID_HANDLE;
+
+ pret = PrlVmCfg_CreateBootDev(sdkdom, &bootDev);
+ prlsdkCheckRetGoto(pret, error);
+
+ pret = PrlBootDev_SetIndex(bootDev, devIndex);
+ prlsdkCheckRetGoto(pret, error);
+
+ pret = PrlBootDev_SetType(bootDev, devType);
+ prlsdkCheckRetGoto(pret, error);
+
+ pret = PrlBootDev_SetSequenceIndex(bootDev, bootSequence);
+ prlsdkCheckRetGoto(pret, error);
+
+ pret = PrlBootDev_SetInUse(bootDev, PRL_TRUE);
+ prlsdkCheckRetGoto(pret, error);
+
+ return 0;
+
+ error:
+ if (bootDev != PRL_INVALID_HANDLE)
+ PrlBootDev_Remove(bootDev);
+
+ return -1;
+}
+
static int prlsdkCheckGraphicsUnsupportedParams(virDomainDefPtr def)
{
virDomainGraphicsDefPtr gr;
@@ -2601,7 +2664,7 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom, virDomainNetDefPtr net)
return ret;
}
-static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk)
+static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool bootDisk)
{
PRL_RESULT pret;
PRL_HANDLE sdkdisk = PRL_INVALID_HANDLE;
@@ -2610,14 +2673,18 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr
disk)
PRL_MASS_STORAGE_INTERFACE_TYPE sdkbus;
int idx;
virDomainDeviceDriveAddressPtr drive;
+ PRL_UINT32 devIndex;
+ PRL_DEVICE_TYPE devType;
if (prlsdkCheckDiskUnsupportedParams(disk) < 0)
return -1;
if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
- pret = PrlVmCfg_CreateVmDev(sdkdom, PDE_HARD_DISK, &sdkdisk);
+ devType = PDE_HARD_DISK;
else
- pret = PrlVmCfg_CreateVmDev(sdkdom, PDE_OPTICAL_DISK, &sdkdisk);
+ devType = PDE_OPTICAL_DISK;
+
+ pret = PrlVmCfg_CreateVmDev(sdkdom, devType, &sdkdisk);
prlsdkCheckRetGoto(pret, cleanup);
pret = PrlVmDev_SetEnabled(sdkdisk, 1);
@@ -2713,6 +2780,14 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr
disk)
goto cleanup;
}
+ if (bootDisk == true) {
+ pret = PrlVmDev_GetIndex(sdkdisk, &devIndex);
+ prlsdkCheckRetGoto(pret, cleanup);
+
+ if (prlsdkAddDeviceToBootList(sdkdom, devIndex, devType, 0) < 0)
+ goto cleanup;
+ }
+
return 0;
cleanup:
PrlHandle_Free(sdkdisk);
@@ -2796,6 +2871,9 @@ prlsdkDoApplyConfig(PRL_HANDLE sdkdom,
if (prlsdkClearDevices(sdkdom) < 0)
goto error;
+ if (prlsdkRemoveBootDevices(sdkdom) < 0)
+ goto error;
+
if (prlsdkApplyGraphicsParams(sdkdom, def) < 0)
goto error;
@@ -2812,8 +2890,17 @@ prlsdkDoApplyConfig(PRL_HANDLE sdkdom,
goto error;
}
+ bool needBoot = true;
for (i = 0; i < def->ndisks; i++) {
- if (prlsdkAddDisk(sdkdom, def->disks[i]) < 0)
+ bool bootDisk = false;
+
+ if (needBoot == true &&
+ def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
+
+ needBoot = false;
+ bootDisk = true;
+ }
+ if (prlsdkAddDisk(sdkdom, def->disks[i], bootDisk) < 0)
goto error;
}
--
1.7.1
9:35 a.m.
New subject: [libvirt] [PATCH 3/3] parallels: Set the first HDD from XML as bootable
On 17.02.2015 12:52, Mikhail Feoktistov wrote:
1. Delete all boot devices for VM instance
2. Find the first HDD from XML and set it as bootable
Now we support only one boot device and it should be HDD
---
src/parallels/parallels_sdk.c | 95 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 91 insertions(+), 4 deletions(-)
diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
index 8660259..15822ab 100644
--- a/src/parallels/parallels_sdk.c
+++ b/src/parallels/parallels_sdk.c
@@ -1987,6 +1987,69 @@ static int prlsdkClearDevices(PRL_HANDLE sdkdom)
return ret;
}
+int
static int. This function is used only within the parallels_sdk.c file.
+prlsdkRemoveBootDevices(PRL_HANDLE sdkdom)
+{
+ PRL_RESULT pret;
+ PRL_UINT32 devCount;
+ PRL_HANDLE dev = PRL_INVALID_HANDLE;
+ PRL_DEVICE_TYPE devType;
+
+ pret = PrlVmCfg_GetBootDevCount(sdkdom, &devCount);
+ prlsdkCheckRetGoto(pret, error);
+
+ for (int i = 0; i < devCount; i++) {
We don't use c99 style of for loops. Moreover, i should be the same type
as devCount.
+
+ /* always get device by index 0, because device list resort after delete */
+ pret = PrlVmCfg_GetBootDev(sdkdom, 0, &dev);
+ prlsdkCheckRetGoto(pret, error);
+
+ pret = PrlBootDev_GetType(dev, &devType);
+ prlsdkCheckRetGoto(pret, error);
+
Trailing whitespace.
+ pret = PrlBootDev_Remove(dev);
+ prlsdkCheckRetGoto(pret, error);
+ }
+
+ return 0;
+
+ error:
+ return -1;
+}
+
+int
Again. static int.
+prlsdkAddDeviceToBootList(PRL_HANDLE sdkdom,
+ PRL_UINT32 devIndex,
+ PRL_DEVICE_TYPE devType,
+ PRL_UINT32 bootSequence)
+{
+ PRL_RESULT pret;
+ PRL_HANDLE bootDev = PRL_INVALID_HANDLE;
+
+ pret = PrlVmCfg_CreateBootDev(sdkdom, &bootDev);
+ prlsdkCheckRetGoto(pret, error);
+
+ pret = PrlBootDev_SetIndex(bootDev, devIndex);
+ prlsdkCheckRetGoto(pret, error);
+
+ pret = PrlBootDev_SetType(bootDev, devType);
+ prlsdkCheckRetGoto(pret, error);
+
+ pret = PrlBootDev_SetSequenceIndex(bootDev, bootSequence);
+ prlsdkCheckRetGoto(pret, error);
+
+ pret = PrlBootDev_SetInUse(bootDev, PRL_TRUE);
+ prlsdkCheckRetGoto(pret, error);
+
Trailing whitepsace.
+ return 0;
+
+ error:
+ if (bootDev != PRL_INVALID_HANDLE)
+ PrlBootDev_Remove(bootDev);
+
+ return -1;
+}
+
static int prlsdkCheckGraphicsUnsupportedParams(virDomainDefPtr def)
{
virDomainGraphicsDefPtr gr;
@@ -2601,7 +2664,7 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom, virDomainNetDefPtr net)
return ret;
}
-static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk)
+static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool bootDisk)
{
PRL_RESULT pret;
PRL_HANDLE sdkdisk = PRL_INVALID_HANDLE;
@@ -2610,14 +2673,18 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr
disk)
PRL_MASS_STORAGE_INTERFACE_TYPE sdkbus;
int idx;
virDomainDeviceDriveAddressPtr drive;
+ PRL_UINT32 devIndex;
+ PRL_DEVICE_TYPE devType;
if (prlsdkCheckDiskUnsupportedParams(disk) < 0)
return -1;
if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
- pret = PrlVmCfg_CreateVmDev(sdkdom, PDE_HARD_DISK, &sdkdisk);
+ devType = PDE_HARD_DISK;
else
- pret = PrlVmCfg_CreateVmDev(sdkdom, PDE_OPTICAL_DISK, &sdkdisk);
+ devType = PDE_OPTICAL_DISK;
+
+ pret = PrlVmCfg_CreateVmDev(sdkdom, devType, &sdkdisk);
prlsdkCheckRetGoto(pret, cleanup);
pret = PrlVmDev_SetEnabled(sdkdisk, 1);
@@ -2713,6 +2780,14 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr
disk)
goto cleanup;
}
+ if (bootDisk == true) {
+ pret = PrlVmDev_GetIndex(sdkdisk, &devIndex);
+ prlsdkCheckRetGoto(pret, cleanup);
+
+ if (prlsdkAddDeviceToBootList(sdkdom, devIndex, devType, 0) < 0)
+ goto cleanup;
+ }
+
return 0;
cleanup:
PrlHandle_Free(sdkdisk);
@@ -2796,6 +2871,9 @@ prlsdkDoApplyConfig(PRL_HANDLE sdkdom,
if (prlsdkClearDevices(sdkdom) < 0)
goto error;
+ if (prlsdkRemoveBootDevices(sdkdom) < 0)
+ goto error;
+
if (prlsdkApplyGraphicsParams(sdkdom, def) < 0)
goto error;
@@ -2812,8 +2890,17 @@ prlsdkDoApplyConfig(PRL_HANDLE sdkdom,
goto error;
}
+ bool needBoot = true;
This has to go up in the beginning of the function, otherwise the
compiler complains that variable initialization is jumped over (all the
gotos above).
for (i = 0; i < def->ndisks; i++) {
- if (prlsdkAddDisk(sdkdom, def->disks[i]) < 0)
+ bool bootDisk = false;
+
+ if (needBoot == true &&
+ def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
+
+ needBoot = false;
+ bootDisk = true;
+ }
+ if (prlsdkAddDisk(sdkdom, def->disks[i], bootDisk) < 0)
goto error;
}
I've fixed all the nits, ACKed and pushed all three patches.
Congratulations on your first libvirt contribution!
Michal
9:40 a.m.
New subject: [libvirt] [PATCH 3/3] parallels: Set the first HDD from XML as bootable
On Thu, Feb 19, 2015 at 04:35:45PM +0100, Michal Privoznik wrote:
On 17.02.2015 12:52, Mikhail Feoktistov wrote:
> 1. Delete all boot devices for VM instance
> 2. Find the first HDD from XML and set it as bootable
>
> Now we support only one boot device and it should be HDD
> ---
> src/parallels/parallels_sdk.c | 95 +++++++++++++++++++++++++++++++++++++++--
> 1 files changed, 91 insertions(+), 4 deletions(-)
>
> diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
> index 8660259..15822ab 100644
> --- a/src/parallels/parallels_sdk.c
> +++ b/src/parallels/parallels_sdk.c
> @@ -1987,6 +1987,69 @@ static int prlsdkClearDevices(PRL_HANDLE sdkdom)
> return ret;
> }
>
> +int
static int. This function is used only within the parallels_sdk.c file.
> +prlsdkRemoveBootDevices(PRL_HANDLE sdkdom)
> +{
> + PRL_RESULT pret;
> + PRL_UINT32 devCount;
> + PRL_HANDLE dev = PRL_INVALID_HANDLE;
> + PRL_DEVICE_TYPE devType;
> +
> + pret = PrlVmCfg_GetBootDevCount(sdkdom, &devCount);
> + prlsdkCheckRetGoto(pret, error);
> +
> + for (int i = 0; i < devCount; i++) {
We don't use c99 style of for loops. Moreover, i should be the same type
as devCount.
Actually, 'make syntax-check' enforces that i is only used for variables
of size_t or ssize_t.
Jan
9:45 a.m.
New subject: [libvirt] [PATCH 3/3] parallels: Set the first HDD from XML as bootable
On 19.02.2015 16:40, Ján Tomko wrote:
On Thu, Feb 19, 2015 at 04:35:45PM +0100, Michal Privoznik wrote:
> On 17.02.2015 12:52, Mikhail Feoktistov wrote:
>> 1. Delete all boot devices for VM instance
>> 2. Find the first HDD from XML and set it as bootable
>>
>> Now we support only one boot device and it should be HDD
>> ---
>> src/parallels/parallels_sdk.c | 95 +++++++++++++++++++++++++++++++++++++++--
>> 1 files changed, 91 insertions(+), 4 deletions(-)
>>
>> diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
>> index 8660259..15822ab 100644
>> --- a/src/parallels/parallels_sdk.c
>> +++ b/src/parallels/parallels_sdk.c
>> @@ -1987,6 +1987,69 @@ static int prlsdkClearDevices(PRL_HANDLE sdkdom)
>> return ret;
>> }
>>
>> +int
>
> static int. This function is used only within the parallels_sdk.c file.
>
>> +prlsdkRemoveBootDevices(PRL_HANDLE sdkdom)
>> +{
>> + PRL_RESULT pret;
>> + PRL_UINT32 devCount;
>> + PRL_HANDLE dev = PRL_INVALID_HANDLE;
>> + PRL_DEVICE_TYPE devType;
>> +
>> + pret = PrlVmCfg_GetBootDevCount(sdkdom, &devCount);
>> + prlsdkCheckRetGoto(pret, error);
>> +
>> + for (int i = 0; i < devCount; i++) {
>
> We don't use c99 style of for loops. Moreover, i should be the same type
> as devCount.
>
Actually, 'make syntax-check' enforces that i is only used for variables
of size_t or ssize_t.
That just a defect of our syntax-check rule.
Michal
3565
days inactive
3567
days old
5 comments
3 participants
participants (3)
-
Ján Tomko -
Michal Privoznik -
Mikhail Feoktistov