1. 18 2月, 2016 15 次提交
    • J
      qemu: Introduce qemuBuildMemCommandLine · aa076fe8
      John Ferlan 提交于
      Add new function to manage adding the '-m' memory options to the command
      line removing that task from the mainline qemuBuildCommandLine
      Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
      aa076fe8
    • J
      qemu: Rename qemuBuildCpuArgStr to qemuBuildCpuCommandLine · d238b51f
      John Ferlan 提交于
      Rename function and move code from mainline qemuBuildCommandLine to
      keep alike code together.
      Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
      d238b51f
    • J
      qemu: Rename qemuBuildMachineArgStr · e3b964bc
      John Ferlan 提交于
      Rename to qemuBuildMachineCommandLine to fit current (and future)
      helper naming conventions.
      Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
      e3b964bc
    • J
      qemu: Make basic upfront checks before create command · 470129a4
      John Ferlan 提交于
      Create qemuBuildCommandLineValidate to make some checks before trying
      to build the command. This will move some logic from much later to much
      earlier - we shouldn't be adjusting any data so that shouldn't matter.
      Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
      470129a4
    • B
      qemu: cgroup: fix cgroup permission logic · 65c4c7d8
      Bjoern Walk 提交于
      Fix logic error introduced in commit d6c91b3c which essentially broke
      starting any domain.
      Signed-off-by: NBjoern Walk <bwalk@linux.vnet.ibm.com>
      65c4c7d8
    • P
      virsh: Remove <backingStore> when changing cdrom media source · 3ad5186e
      Peter Krempa 提交于
      Since the code is changing the source image path by modifying the
      existing XML snippet the <backingStore> stays in place.
      
      As <backingStore> is relevant to the <source> part of the image, the
      update of that part makes the element invalid.
      
      CD/floppy images usually don't have a backing chain and the element is
      currently ignored though but it might start being used in the future so
      let's start behaving correctly.
      
      Drop the <backingStore> subtree once we want to update the XML.
      
      Before this patch, you'd get:
      $ virsh change-media --eject --print-xml 10 hdc
      <disk type="file" device="cdrom">
            <driver name="qemu" type="qcow2"/>
      
            <backingStore type="file" index="1">
              <format type="qcow2"/>
              <source file="/var/lib/libvirt/images/vm.1436949097"/>
              <backingStore/>
            </backingStore>
            <target dev="hdc" bus="ide"/>
            ...
          </disk>
      
      After:
      
       $ virsh change-media --eject --print-xml 10 hdc
      <disk type="file" device="cdrom">
            <driver name="qemu" type="qcow2"/>
      
            <target dev="hdc" bus="ide"/>
            ...
          </disk>
      3ad5186e
    • J
      qemu: Remove local emulator · 71eb431c
      John Ferlan 提交于
      Remove the local variable 'emulator' and just use def->emulator
      Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
      71eb431c
    • P
      qemu: Kill VIR_WRAPPER_SHELL_PREFIX · d46eb9e5
      Peter Krempa 提交于
      The migration code now doesn't need it, so remove the macros and the
      configure code that is detecting it.
      d46eb9e5
    • C
      qemu: Move PORT definitions to qemu_conf.c · 4b9fa114
      Cole Robinson 提交于
      Which is the only user. That was the only reason for including
      qemu_command.h, though we need to explicitly include qemu_domain.h
      afterwards.
      4b9fa114
    • C
      tests: Remove unused virtTestClearLineRegex · ad859090
      Cole Robinson 提交于
      This was only used for test 'xml blanking', which has now all
      been removed, and isn't an ideal paradigm anyways since it
      inhibits easy XML regeneration.
      ad859090
    • C
      tests: lxcconf2xml: Drop XML blanking · 1064fb33
      Cole Robinson 提交于
      Hardcode a UUID like we did for qemuargv2xml, so we can use standard
      comparison helpers, which gives us VIR_TEST_REGENERATE_OUTPUT support
      1064fb33
    • C
      tests: qemuargv2xml: Drop memory XML blanking · 2fc011fe
      Cole Robinson 提交于
      The memory XML blanking is only there to avoid the unit= churn that
      was added by default a long time ago.
      
      Drop the blanking, switch over to using the standard comparison
      helpers, and regenerate the output with VIR_TEST_REGENERATE_OUTPUT.
      2fc011fe
    • C
      tests: qemuargv2xml: hardcode disk auth usage · 73ed1d74
      Cole Robinson 提交于
      If a qemuargv has iscsi or ceph secrets on the command line, we will
      convert that to XML like:
      
        <auth username='myname'>
          <secret type='iscsi'/>
        </auth>
      
      This is not valid XML, as either a UUID or usage must be specified in
      the secret block. It's not clear though how the argv2xml code can do
      anything correct here, since XML like this requires a libvirt secret
      object to have already been defined.
      
      The current test suite handles this by blanking out any <secret> block
      in the XML. This avoids domainschematest failures.
      
      Instead of blanking, let's hardcode a usage= name. This lets us test
      the other bits of generated <secret> XML, and is a step towards wiring
      up VIR_TEST_REGENERATE_OUTPUT
      73ed1d74
    • C
      tests: qemuargv2xml: Remove UUID randomness · b25027ba
      Cole Robinson 提交于
      Overwrite any randomly generated UUID to use a hardcoded value, so
      we don't need to blank it when comparing XML.
      b25027ba
    • C
      tests: qemuargv2xml: Remove unneeded XML blanking · 7973c0ef
      Cole Robinson 提交于
      None of the test cases depend on dropping these XML bits
      7973c0ef
  2. 17 2月, 2016 25 次提交