1. 15 4月, 2016 15 次提交
    • P
      qemu: command: Refactor memballoon command line formatting · 33b9598c
      Peter Krempa 提交于
      Now that there is just one format of the memory balloon command line
      used the code can be merged into a single function.
      
      Additionally with some tweaks to the control flow the code is easier to
      read.
      33b9598c
    • P
      qemu: command: Drop obsolete comment · 388b356e
      Peter Krempa 提交于
      The change that made qemu not add the memballoon by default happened
      prior to 0.12.0. Additionaly the comment was misleading due to the code
      that was added below. Since we always need to add a balloon on the
      commandline drop the comment.
      388b356e
    • P
      qemu: caps: Deprecate QEMU_CAPS_BALLOON · 2242a008
      Peter Krempa 提交于
      The flag is now unused and all qemus supported by libvirt already
      support it.
      2242a008
    • P
    • C
      qemu: migration: Drop dead VNC cookie handling · dae0e227
      Cole Robinson 提交于
      The only caller of this code is:
      
          for (i = 0; i < dom->def->ngraphics; i++) {
             if (dom->def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
                 if (!(mig->graphics =
                       qemuMigrationCookieGraphicsAlloc(driver, dom->def->graphics[i])))
                     return -1;
                 mig->flags |= QEMU_MIGRATION_COOKIE_GRAPHICS;
                 break;
             }
          }
      
      So this is never triggered for VNC, and in fact VNC has no support for
      seamless migration anyways so that seems correct. Drop the dead VNC
      handling.
      dae0e227
    • L
      qemu: support new pci controller model "pcie-expander-bus" · 8b62c65d
      Laine Stump 提交于
      This is backed by the qemu device pxb-pcie, which will be available in
      qemu 2.6.0.
      
      As with pci-expander-bus (which uses qemu's pxb device), the busNr
      attribute and <node> subelement of <target> are used to set the bus_nr
      and numa_node options.
      
      During post-parse we validate that the domain's machinetype is
      q35-based (since the device shows up for 440fx-based machinetypes, but
      is unusable), as well as checking that <node> specifies a node that is
      actually configured on the guest.
      8b62c65d
    • L
      conf: new pci controller model pcie-expander-bus · bc07251f
      Laine Stump 提交于
      This controller provides a single PCIe port on a new root. It is
      similar to pci-expander-bus, intended to provide a bus that can be
      associated with a guest-identifiable NUMA node, but is for
      machinetypes with PCIe rather than PCI (e.g. q35-based machinetypes).
      
      Aside from PCIe vs. PCI, the other main difference is that a
      pci-expander-bus has a companion pci-bridge that is automatically
      attached along with it, but pcie-expander-bus has only a single port,
      and that port will only connect to a pcie-root-port, or to a
      pcie-switch-upstream-port. In order for the bus to be of any use in
      the guest, it must have either a pcie-root-port or a
      pcie-switch-upstream-port attached (and one or more
      pcie-switch-downstream-ports attached to the
      pcie-switch-upstream-port).
      bc07251f
    • L
      qemu: add capabilities bit for device "pxb-pcie" · 0ec0bc85
      Laine Stump 提交于
          The pxb device is a PCIe expander bus that can be added to any
          Q35-based machinetype. A single PCIe port (*not* hotpluggable) is
          provided; if more than one device is desired, or if hotplug
          support is needed, either a pcie-root-port, or some combination of
          pcie-switch-upstream-port and pcie-swith-downstream-ports must be
          added to it. It can have a NUMA node number associated with it, as
          well as a bus number.
      0ec0bc85
    • L
      qemu: support new pci controller model "pci-expander-bus" · 400b2976
      Laine Stump 提交于
      This is backed by the qemu device "pxb".
      
      The pxb device always includes a pci-bridge that is at the bus number
      of the pxb + 1.
      
      busNr and <node> from the <target> subelement are used to set the
      bus_nr and numa_node options for pxb.
      
      During post-parse we validate that the domain's machinetype is
      440fx-based (since the pxb device only works on 440fx-based machines),
      and <node> also gets a sanity check to assure that the NUMA node
      specified for the pxb (if any - it's optional) actually exists on the
      guest.
      400b2976
    • L
      conf: new pci controller model pci-expander-bus · 52f3d0a4
      Laine Stump 提交于
      This is a standard PCI root bus (not a bridge) that can be added to a
      440fx-based domain. Although it uses a PCI slot, this is *not* how it
      is connected into the PCI bus hierarchy, but is only used for
      control. Each pci-expander-bus provides 32 slots (0-31) that can
      accept hotplug of standard PCI devices.
      
      The usefulness of pci-expander-bus relative to a pci-bridge is that
      the NUMA node of the bus can be specified with the <node> subelement
      of <target>. This gives guest-side visibility to the NUMA node of
      attached devices (presuming that management apps only assign a device
      to a bus that has a NUMA node number matching the node number of the
      device on the host).
      
      Each pci-expander-bus also has a "busNr" attribute. The expander-bus
      itself will take the busNr specified, and all buses that are connected
      to this bus (including the pci-bridge that is automatically added to
      any expander bus of model "pxb" (see the next commit)) will use
      busNr+1, busNr+2, etc, and the pci-root (or the expander-bus with next
      lower busNr) will use bus numbers lower than busNr.
      52f3d0a4
    • L
      qemu: add capabilities bit for device "pxb" · 5d4e2b17
      Laine Stump 提交于
      The pxb device is a PCI expander bus that can be added to any
      440fx-based machinetype. The PCI bus that is created has 32 standard
      PCI slots (hotpluggable). It can have a NUMA node number associated
      with it, as well as a bus number.
      5d4e2b17
    • L
      qemu: set PCI controller default modelName in a separate function · 1da28473
      Laine Stump 提交于
      Since every PCI controller model has to have a default model name set,
      put it in a separate function to clean up qemuDomainAssignPCIAddresses
      a bit.
      1da28473
    • L
      conf: utility function to convert PCI controller model into connect type · a0616ee8
      Laine Stump 提交于
      There are two places in qemu_domain_address.c where we have a switch
      statement to convert PCI controller models
      (VIR_DOMAIN_CONTROLLER_MODEL_PCI*) into the connection type flag that
      is matched when looking for an upstream connection for that model of
      controller (VIR_PCI_CONNECT_TYPE_*). This patch makes a utility
      function in conf/domain_addr.c to do that, so that when a new PCI
      controller is added, we only need to add the new model-->connect-type
      in a single place.
      a0616ee8
    • L
      conf/qemu: change the way VIR_PCI_CONNECT_TYPE_* flags work · d1cc4605
      Laine Stump 提交于
      The flags used to determine which devices could be plugged into which
      controllers were quite confusing, as they tried to create classes of
      connections, then put particular devices into possibly multiple
      classes, while sometimes setting multiple flags for the controllers
      themselves. The attempt to have a single flag indicate, e.g. that a
      root-port or a switch-downstream-port could connect was not only
      confusing, it was leading to a situation where it would be impossible
      to specify exactly the right combinations for a new controller.
      
      The solution is for the VIR_PCI_CONNECT_TYPE_* flags to have a 1:1
      correspondence with each type of PCI controller, plus a flag for a PCI
      endpoint device and another for a PCIe endpoint device (the only
      exception to this is that pci-bridge and pcie-expander-bus controllers
      have their upstream connection classified as
      VIR_PCI_CONNECT_TYPE_PCI_DEVICE since they can be plugged into
      *exactly* the same ports as any endpoint device).  Each device then
      has a single flag for connect type (plus the HOTPLUG flag if that
      device can e hotplugged), and each controller sets the CONNECT bits
      for all controllers that can be plugged into it, as well as for either
      type of endpoint device that can be plugged in (and the HOTPLUG flag
      if it can accept hotplugged devices).
      
      With this change, it is *slightly* easier to understand the matching
      of connections (as long as you remember that the flag for a
      device/upstream-facing connection of a controller is the same as that
      device's type, while the flags for a controller's downstream
      connections is the OR of all device types that can be plugged into
      that controller). More importantly, it will be possible to correctly
      specify what can be plugged into a pcie-switch-expander-bus, when
      support for it is added.
      d1cc4605
    • C
      qemu: command: don't overwrite watchdog dump action · a91177c8
      Cole Robinson 提交于
      The watchdog cli refactoring in 4666b762 dropped the temporary variable
      we use to convert to action=dump to action=pause for the qemu cli, and
      stored the converted value in the domain structure. Our other watchdog
      handling code then treated it as though the user requested action=pause,
      which broke action=dump handling.
      
      Revive the temporary variable to fix things.
      a91177c8
  2. 14 4月, 2016 4 次提交
  3. 13 4月, 2016 12 次提交
    • P
      build: fix build on RHEL-6 · 6e76738e
      Pavel Hrdina 提交于
      GCC in RHEL-6 complains about listen:
      
      ../../src/conf/domain_conf.c:23718: error: declaration of 'listen' shadows a global declaration [-Wshadow]
      /usr/include/sys/socket.h:204: error: shadowed declaration is here [-Wshadow]
      
      This renames all the listen to gListen.
      Signed-off-by: NPavel Hrdina <phrdina@redhat.com>
      6e76738e
    • J
      qemuExecuteEthernetScript: move to util · d5a49e5d
      Ján Tomko 提交于
      This is just a wrapper for virCommand that takes two strings
      and runs them.
      
      Move it to virnetdev.c for easier mocking.
      d5a49e5d
    • P
      qemu: process: Wire up ACPI OST events to notify users of failed memory unplug · 0ad64e20
      Peter Krempa 提交于
      Since qemu is now able to notify us that the guest rejected the memory
      unplug operation we can relay this to the user and make the API fail
      right away.
      
      Additionally document the possible values from the ACPI docs for future
      reference.
      
      Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1320447
      0ad64e20
    • P
      qemu: monitor: Add support for ACPI_DEVICE_OST event handling · 650e8d2c
      Peter Krempa 提交于
      The event is emitted on ACPI OSPM Status Indication events.
      
      ACPI standard documentation describes the method as:
      
      This object is an optional control method that is invoked by OSPM to
      indicate processing status to the platform. During device ejection,
      device hot add, or other event processing, OSPM may need to perform
      specific handshaking with the platform. OSPM may also need to indicate
      to the platform its inability to complete a requested operation; for
      example, when a user presses an ejection button for a device that is
      currently in use or is otherwise currently incapable of being ejected.
      In this case, the processing of the ACPI Eject Request notification by
      OSPM fails. OSPM may indicate this failure to the platform through the
      invocation of the _OST control method. As a result of the status
      notification indicating ejection failure, the platform may take certain
      action including reissuing the notification or perhaps turning on an
      appropriate indicator light to signal the failure to the user.
      650e8d2c
    • P
      qemu: hotplug: Add support for signalling device unplug failure · 1ac38640
      Peter Krempa 提交于
      Similarly to the DEVICE_DELETED event we will be able to tell when
      unplug of certain device types will be rejected by the guest OS. Wire up
      the device deletion signalling code to allow handling this.
      1ac38640
    • P
      qemu: Use domain condition for device removal signaling · 0f621198
      Peter Krempa 提交于
      No need to keep two separate conditions. A slight juggling of return
      values is needed to accomodate virDomainObjWaitUntil.
      0f621198
    • P
      qemu: hotplug: Refactor semantics of qemuDomainWaitForDeviceRemoval · 986a016c
      Peter Krempa 提交于
      Neither of the callers cares whether the DEVICE_DELETED event isn't
      supported or the event was received. Simplify the code and callers by
      unifying the two values and changing the return value constants so that
      a temporary variable can be omitted.
      986a016c
    • P
      qemu: hotplug: Properly handle errors in qemuDomainWaitForDeviceRemoval · 65b390ad
      Peter Krempa 提交于
      Callers ignore if this function returns -1 and continue as though the
      DEVICE_DELETED event was not received. Since we can't be sure that the
      event was not received we should behave as if the event was not
      supported and remove the device definition right away. The error
      fortunately won't really happen here.
      65b390ad
    • J
      qemu: assign addresses before aliases · 786bc251
      Ján Tomko 提交于
      The address assigning code might add new pci bridges.
      We need them to have an alias when building the command line.
      
      In real word usage, this is not a problem because all the code
      paths already call qemuDomainAssignAddresses. However moving
      this call lets us remove one extra call from qemuxml2argvtest.
      786bc251
    • J
      drop qemuBuildCommandLineCallbacks · 0da965c5
      Ján Tomko 提交于
      Essentially revert commit 3a6204cb which added these to allow the test
      suite to pass without depending on the host system state.
      
      Since commit 4b527c1a we already mock virSCSIDeviceGetSgName, so these
      callbacks are useless.
      0da965c5
    • P
      use virDomainGraphicsGetListen instead of the other getters · f53bb3ed
      Pavel Hrdina 提交于
      There is no point the use two different getters on the same listen
      structure few lines apart.
      Signed-off-by: NPavel Hrdina <phrdina@redhat.com>
      f53bb3ed
    • P
      domain_conf: introduce virDomainGraphicsListenAppendAddress · 4b75237f
      Pavel Hrdina 提交于
      This effectively removes virDomainGraphicsListenSetAddress which was
      used only to change the address of listen structure and possible change
      the listen type.  The new function will auto-expand the listens array
      and append a new listen.
      
      The old function was used on pre-allocated array of listens and in most
      cases it only "add" a new listen.  The two remaining uses can access the
      listen structure directly.
      Signed-off-by: NPavel Hrdina <phrdina@redhat.com>
      4b75237f
  4. 11 4月, 2016 2 次提交
  5. 10 4月, 2016 1 次提交
    • R
      qemu: fix build without gnutls installed · acb63aaf
      Roman Bogorodskiy 提交于
      Move including of gnutls/gnutls.h in qemu/qemu_domain.c under the
      "ifdef WITH_GNUTLS" check because otherwise it fails like this:
      
        CC       qemu/libvirt_driver_qemu_impl_la-qemu_domain.lo
      qemu/qemu_domain.c:50:10: fatal error: 'gnutls/gnutls.h' file not found
      
      in case if gnutls is not installed on the system.
      acb63aaf
  6. 08 4月, 2016 2 次提交
  7. 07 4月, 2016 4 次提交