[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH v5 2/4] qemu : Add loadparm to qemu command line string




On 06/01/2017 12:36 PM, Farhan Ali wrote:
> Introduce a new QEMU capability for loadparm and if the capability is
> supported by QEMU then append the loadparm value to "-machine" string
> of qemu command line.
> 
> Also add test cases for loadparm.
> 
> Signed-off-by: Farhan Ali <alifm linux vnet ibm com>
> Reviewed-by: Bjoern Walk <bwalk linux vnet ibm com>
> Reviewed-by: Boris Fiuczynski <fiuczy linux vnet ibm com>
> Reviewed-by: Marc Hartmayer <mhartmay linux vnet ibm com>
> ---
>  src/qemu/qemu_capabilities.c                       |  3 ++
>  src/qemu/qemu_capabilities.h                       |  3 ++
>  src/qemu/qemu_command.c                            | 33 ++++++++++++++++
>  ...-machine-loadparm-multiple-disks-nets-s390.args | 28 ++++++++++++++
>  ...v-machine-loadparm-multiple-disks-nets-s390.xml | 43 +++++++++++++++++++++
>  .../qemuxml2argv-machine-loadparm-net-s390.args    | 20 ++++++++++
>  .../qemuxml2argv-machine-loadparm-net-s390.xml     | 26 +++++++++++++
>  ...xml2argv-machine-loadparm-s390-char-invalid.xml | 26 +++++++++++++
>  ...uxml2argv-machine-loadparm-s390-len-invalid.xml | 26 +++++++++++++
>  .../qemuxml2argv-machine-loadparm-s390.args        | 20 ++++++++++
>  .../qemuxml2argv-machine-loadparm-s390.xml         | 26 +++++++++++++
>  tests/qemuxml2argvtest.c                           | 19 ++++++++++
>  ...t-machine-loadparm-multiple-disks-nets-s390.xml | 44 ++++++++++++++++++++++
>  tests/qemuxml2xmltest.c                            |  4 ++
>  14 files changed, 321 insertions(+)
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.args
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.xml
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-char-invalid.xml
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-len-invalid.xml
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.args
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.xml
>  create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-loadparm-multiple-disks-nets-s390.xml
> 

Due to time on list some new capabilities were added, so there was a
merge here. I took care of that merge.

The capabilities changes should be their own patch, so I swapped patch 2
and 3, then merged the capabilities changes into the new patch 2 which
was the old patch 3.

I also made one slight adjustment noted below

Reviewed-by: John Ferlan <jferlan redhat com>

John

> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index 7ea8505..4667dcb 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -372,6 +372,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
>                "intel-iommu.intremap",
>                "intel-iommu.caching-mode",
>                "intel-iommu.eim",
> +
> +              "loadparm", /* 260 */
>      );
>  
>  
> @@ -3146,6 +3148,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
>      { "drive", "throttling.group", QEMU_CAPS_DRIVE_IOTUNE_GROUP },
>      { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE },
>      { "machine", "kernel_irqchip", QEMU_CAPS_MACHINE_KERNEL_IRQCHIP },
> +    { "machine", "loadparm", QEMU_CAPS_LOADPARM },
>  };
>  
>  static int
> diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> index eba9814..921bc6e 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -411,6 +411,9 @@ typedef enum {
>      QEMU_CAPS_INTEL_IOMMU_CACHING_MODE, /* intel-iommu.caching-mode */
>      QEMU_CAPS_INTEL_IOMMU_EIM, /* intel-iommu.eim */
>  
> +    /* 260 */
> +    QEMU_CAPS_LOADPARM, /* -machine loadparm */
> +
>      QEMU_CAPS_LAST /* this must always be the last item */
>  } virQEMUCapsFlags;
>  
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 015af10..ab690bf 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -7237,6 +7237,34 @@ qemuAppendKeyWrapMachineParms(virBuffer *buf, virQEMUCapsPtr qemuCaps,
>      return true;
>  }
>  
> +
> +static void
> +qemuAppendLoadparmMachineParm(virBuffer *buf,
> +                              const virDomainDef *def)
> +{
> +    size_t i = 0;
> +
> +    for (i = 0; i < def->ndisks; i++) {
> +        virDomainDiskDefPtr disk = def->disks[i];
> +
> +        if (disk->info.bootIndex == 1 && disk->info.loadparm) {
> +            virBufferAsprintf(buf, ",loadparm=%s", disk->info.loadparm);
> +            return;
> +        }
> +    }
> +
> +    /* Network boot device */
> +    for (i = 0; i < def->nnets; i++) {
> +        virDomainNetDefPtr net = def->nets[i];
> +
> +        if (net->info.bootIndex == 1 && net->info.loadparm) {
> +            virBufferAsprintf(buf, ",loadparm=%s", net->info.loadparm);
> +            return;
> +        }
> +    }
> +}
> +
> +
>  static int
>  qemuBuildNameCommandLine(virCommandPtr cmd,
>                           virQEMUDriverConfigPtr cfg,
> @@ -7476,6 +7504,11 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
>              }
>          }
>  
> +        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX) &&
> +            virQEMUCapsGet(qemuCaps, QEMU_CAPS_LOADPARM)) {
> +            qemuAppendLoadparmMachineParm(&buf, def);
> +        }

No need for { } in this case with just one line - although the multiline
condition fools the libvirt syntax-check parser...

> +
>          virCommandAddArgBuffer(cmd, &buf);
>      }
>  
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args
> new file mode 100644
> index 0000000..ac0f6bc
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args
> @@ -0,0 +1,28 @@
> +LC_ALL=C \
> +PATH=/bin \
> +HOME=/home/test \
> +USER=test \
> +LOGNAME=test \
> +QEMU_AUDIO_DRV=none \
> +/usr/bin/qemu-system-s390x \
> +-name QEMUGuest1 \
> +-S \
> +-machine s390-ccw-virtio,accel=tcg,loadparm=SYSTEM1 \
> +-m 214 \
> +-smp 1,sockets=1,cores=1,threads=1 \
> +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
> +-nographic \
> +-nodefaults \
> +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
> +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
> +-device virtio-blk-ccw,devno=fe.0.0002,drive=drive-virtio-disk0,\
> +id=virtio-disk0,bootindex=1 \
> +-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk1 \
> +-device virtio-blk-ccw,devno=fe.0.0003,drive=drive-virtio-disk1,\
> +id=virtio-disk1,bootindex=3 \
> +-device virtio-net-ccw,vlan=0,id=net0,mac=00:11:22:33:44:54,devno=fe.0.0000,\
> +bootindex=2 \
> +-net user,vlan=0,name=hostnet0 \
> +-device virtio-net-ccw,vlan=1,id=net1,mac=00:11:22:33:42:36,devno=fe.0.0004 \
> +-net user,vlan=1,name=hostnet1 \
> +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml
> new file mode 100644
> index 0000000..df442e9
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml
> @@ -0,0 +1,43 @@
> +<domain type='qemu'>
> +  <name>QEMUGuest1</name>
> +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> +  <memory>219136</memory>
> +  <currentMemory>219136</currentMemory>
> +  <vcpu>1</vcpu>
> +  <os>
> +    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
> +  </os>
> +  <clock offset='utc'/>
> +  <on_poweroff>destroy</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>destroy</on_crash>
> +  <devices>
> +    <emulator>/usr/bin/qemu-system-s390x</emulator>
> +    <disk type='block' device='disk'>
> +      <source dev='/dev/HostVG/QEMUGuest1'/>
> +      <target dev='hda' bus='virtio'/>
> +      <boot order='1' loadparm='system1'/>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x2'/>
> +    </disk>
> +    <disk type='block' device='disk'>
> +      <source dev='/dev/HostVG/QEMUGuest2'/>
> +      <target dev='hdb' bus='virtio'/>
> +      <boot order='3' loadparm='3'/>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x3'/>
> +    </disk>
> +    <interface type='user'>
> +      <mac address='00:11:22:33:44:54'/>
> +      <model type='virtio'/>
> +      <boot order='2' loadparm='2.lp'/>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0'/>
> +    </interface>
> +   <interface type='user'>
> +      <mac address='00:11:22:33:42:36'/>
> +      <model type='virtio'/>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x4'/>
> +    </interface>
> +    <memballoon model='virtio'>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x1'/>
> +    </memballoon>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.args
> new file mode 100644
> index 0000000..d745c15
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.args
> @@ -0,0 +1,20 @@
> +LC_ALL=C \
> +PATH=/bin \
> +HOME=/home/test \
> +USER=test \
> +LOGNAME=test \
> +QEMU_AUDIO_DRV=none \
> +/usr/bin/qemu-system-s390x \
> +-name QEMUGuest1 \
> +-S \
> +-machine s390-ccw-virtio,accel=tcg,loadparm=2 \
> +-m 214 \
> +-smp 1,sockets=1,cores=1,threads=1 \
> +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
> +-nographic \
> +-nodefaults \
> +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
> +-device virtio-net-ccw,vlan=0,id=net0,mac=00:11:22:33:44:54,devno=fe.0.0000,\
> +bootindex=1 \
> +-net user,vlan=0,name=hostnet0 \
> +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.xml
> new file mode 100644
> index 0000000..ca682af
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.xml
> @@ -0,0 +1,26 @@
> +<domain type='qemu'>
> +  <name>QEMUGuest1</name>
> +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> +  <memory>219136</memory>
> +  <currentMemory>219136</currentMemory>
> +  <vcpu>1</vcpu>
> +  <os>
> +    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
> +  </os>
> +  <clock offset='utc'/>
> +  <on_poweroff>destroy</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>destroy</on_crash>
> +  <devices>
> +    <emulator>/usr/bin/qemu-system-s390x</emulator>
> +    <interface type='user'>
> +      <mac address='00:11:22:33:44:54'/>
> +      <model type='virtio'/>
> +      <boot order='1' loadparm='2'/>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0'/>
> +    </interface>
> +    <memballoon model='virtio'>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x1'/>
> +    </memballoon>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-char-invalid.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-char-invalid.xml
> new file mode 100644
> index 0000000..5cca5f9
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-char-invalid.xml
> @@ -0,0 +1,26 @@
> +<domain type='qemu'>
> +  <name>QEMUGuest1</name>
> +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> +  <memory>219136</memory>
> +  <currentMemory>219136</currentMemory>
> +  <vcpu>1</vcpu>
> +  <os>
> +    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
> +  </os>
> +  <clock offset='utc'/>
> +  <on_poweroff>destroy</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>destroy</on_crash>
> +  <devices>
> +    <emulator>/usr/bin/qemu-system-s390x</emulator>
> +    <disk type='block' device='disk'>
> +      <source dev='/dev/HostVG/QEMUGuest1'/>
> +      <target dev='hda' bus='virtio'/>
> +      <boot order='1' loadparm='sys1?'/>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0'/>
> +    </disk>
> +    <memballoon model='virtio'>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x1'/>
> +    </memballoon>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-len-invalid.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-len-invalid.xml
> new file mode 100644
> index 0000000..ddc4baa
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-len-invalid.xml
> @@ -0,0 +1,26 @@
> +<domain type='qemu'>
> +  <name>QEMUGuest1</name>
> +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> +  <memory>219136</memory>
> +  <currentMemory>219136</currentMemory>
> +  <vcpu>1</vcpu>
> +  <os>
> +    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
> +  </os>
> +  <clock offset='utc'/>
> +  <on_poweroff>destroy</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>destroy</on_crash>
> +  <devices>
> +    <emulator>/usr/bin/qemu-system-s390x</emulator>
> +    <disk type='block' device='disk'>
> +      <source dev='/dev/HostVG/QEMUGuest1'/>
> +      <target dev='hda' bus='virtio'/>
> +      <boot order='1' loadparm='loadparm1'/>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0'/>
> +    </disk>
> +    <memballoon model='virtio'>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x1'/>
> +    </memballoon>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.args
> new file mode 100644
> index 0000000..07412e3
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.args
> @@ -0,0 +1,20 @@
> +LC_ALL=C \
> +PATH=/bin \
> +HOME=/home/test \
> +USER=test \
> +LOGNAME=test \
> +QEMU_AUDIO_DRV=none \
> +/usr/bin/qemu-system-s390x \
> +-name QEMUGuest1 \
> +-S \
> +-machine s390-ccw-virtio,accel=tcg,loadparm=2 \
> +-m 214 \
> +-smp 1,sockets=1,cores=1,threads=1 \
> +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
> +-nographic \
> +-nodefaults \
> +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
> +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
> +-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\
> +id=virtio-disk0,bootindex=1 \
> +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.xml
> new file mode 100644
> index 0000000..96db020
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.xml
> @@ -0,0 +1,26 @@
> +<domain type='qemu'>
> +  <name>QEMUGuest1</name>
> +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> +  <memory>219136</memory>
> +  <currentMemory>219136</currentMemory>
> +  <vcpu>1</vcpu>
> +  <os>
> +    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
> +  </os>
> +  <clock offset='utc'/>
> +  <on_poweroff>destroy</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>destroy</on_crash>
> +  <devices>
> +    <emulator>/usr/bin/qemu-system-s390x</emulator>
> +    <disk type='block' device='disk'>
> +      <source dev='/dev/HostVG/QEMUGuest1'/>
> +      <target dev='hda' bus='virtio'/>
> +      <boot order='1' loadparm='2'/>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0'/>
> +    </disk>
> +    <memballoon model='virtio'>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x1'/>
> +    </memballoon>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index b360185..bad99e9 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -2460,6 +2460,25 @@ mymain(void)
>              QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_SCSI,
>              QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
>  
> +    DO_TEST("machine-loadparm-s390", QEMU_CAPS_MACHINE_OPT,
> +            QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390,
> +            QEMU_CAPS_BOOTINDEX, QEMU_CAPS_LOADPARM);
> +    DO_TEST("machine-loadparm-net-s390", QEMU_CAPS_MACHINE_OPT,
> +            QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390,
> +            QEMU_CAPS_BOOTINDEX, QEMU_CAPS_LOADPARM);
> +    DO_TEST("machine-loadparm-multiple-disks-nets-s390",
> +            QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_CCW,
> +            QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_BOOTINDEX,
> +            QEMU_CAPS_LOADPARM);
> +    DO_TEST_PARSE_ERROR("machine-loadparm-s390-char-invalid",
> +                        QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_CCW,
> +                        QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_BOOTINDEX,
> +                        QEMU_CAPS_LOADPARM);
> +    DO_TEST_PARSE_ERROR("machine-loadparm-s390-len-invalid",
> +                        QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_CCW,
> +                        QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_BOOTINDEX,
> +                        QEMU_CAPS_LOADPARM);
> +
>      DO_TEST("qemu-ns-domain-ns0", NONE);
>      DO_TEST("qemu-ns-domain-commandline", NONE);
>      DO_TEST("qemu-ns-domain-commandline-ns0", NONE);
> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-loadparm-multiple-disks-nets-s390.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-loadparm-multiple-disks-nets-s390.xml
> new file mode 100644
> index 0000000..2f0bb83
> --- /dev/null
> +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-loadparm-multiple-disks-nets-s390.xml
> @@ -0,0 +1,44 @@
> +<domain type='qemu'>
> +  <name>QEMUGuest1</name>
> +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> +  <memory unit='KiB'>219136</memory>
> +  <currentMemory unit='KiB'>219136</currentMemory>
> +  <vcpu placement='static'>1</vcpu>
> +  <os>
> +    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
> +  </os>
> +  <clock offset='utc'/>
> +  <on_poweroff>destroy</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>destroy</on_crash>
> +  <devices>
> +    <emulator>/usr/bin/qemu-system-s390x</emulator>
> +    <disk type='block' device='disk'>
> +      <source dev='/dev/HostVG/QEMUGuest1'/>
> +      <target dev='hda' bus='virtio'/>
> +      <boot order='1' loadparm='SYSTEM1'/>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
> +    </disk>
> +    <disk type='block' device='disk'>
> +      <source dev='/dev/HostVG/QEMUGuest2'/>
> +      <target dev='hdb' bus='virtio'/>
> +      <boot order='3' loadparm='3'/>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/>
> +    </disk>
> +    <interface type='user'>
> +      <mac address='00:11:22:33:44:54'/>
> +      <model type='virtio'/>
> +      <boot order='2' loadparm='2.LP'/>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
> +    </interface>
> +    <interface type='user'>
> +      <mac address='00:11:22:33:42:36'/>
> +      <model type='virtio'/>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0004'/>
> +    </interface>
> +    <memballoon model='virtio'>
> +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
> +    </memballoon>
> +    <panic model='s390'/>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
> index fff13e2..a1e189e 100644
> --- a/tests/qemuxml2xmltest.c
> +++ b/tests/qemuxml2xmltest.c
> @@ -1136,6 +1136,10 @@ mymain(void)
>      DO_TEST("cpu-check-default-none2", NONE);
>      DO_TEST("cpu-check-default-partial", NONE);
>      DO_TEST("cpu-check-default-partial2", NONE);
> +    DO_TEST("machine-loadparm-multiple-disks-nets-s390",
> +            QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_CCW,
> +            QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_BOOTINDEX,
> +            QEMU_CAPS_LOADPARM);
>  
>      qemuTestDriverFree(&driver);
>  
> 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]