Commit 14df77a6 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'mst/tags/for_anthony' into staging 

* mst/tags/for_anthony:
  vhost: Pass device path to vhost_dev_init()
  monitor: Rename+move net_handle_fd_param -> monitor_handle_fd_param
  pcie_aer: clear cmask for Advanced Error Interrupt Message Number
  pcie: drop version_id field for live migration
  qemu: add .exrc
parents 455aa1e0 1241ed94

.exrc

0 → 100644
+7 −0
Original line number Diff line number Diff line 
"VIM settings to match QEMU coding style.  They are activated by adding the

"following settings (without the " symbol) as last two lines in $HOME/.vimrc:

"set secure

"set exrc

set expandtab

set shiftwidth=4

set smarttab

hw/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ const VMStateDescription vmstate_pci_device = { 
};



const VMStateDescription vmstate_pcie_device = {

    .name = "PCIDevice",

    .name = "PCIEDevice",

    .version_id = 2,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

hw/pcie.h

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ extern const VMStateDescription vmstate_pcie_device; 


#define VMSTATE_PCIE_DEVICE(_field, _state) {                        \

    .name       = (stringify(_field)),                               \

    .version_id = 2,                                                 \

    .size       = sizeof(PCIDevice),                                 \

    .vmsd       = &vmstate_pcie_device,                              \

    .flags      = VMS_STRUCT,                                        \

hw/pcie_aer.c

+5 −0
Original line number Diff line number Diff line
@@ -738,6 +738,11 @@ void pcie_aer_root_init(PCIDevice *dev) 
                 PCI_ERR_ROOT_CMD_EN_MASK);

    pci_set_long(dev->w1cmask + pos + PCI_ERR_ROOT_STATUS,

                 PCI_ERR_ROOT_STATUS_REPORT_MASK);

    /* PCI_ERR_ROOT_IRQ is RO but devices change it using a

     * device-specific method.

     */

    pci_set_long(dev->cmask + pos + PCI_ERR_ROOT_STATUS,

                 ~PCI_ERR_ROOT_IRQ);

}



void pcie_aer_root_reset(PCIDevice *dev)

hw/vhost.c

+3 −2
Original line number Diff line number Diff line
@@ -747,14 +747,15 @@ static void vhost_eventfd_del(MemoryListener *listener, 
{

}



int vhost_dev_init(struct vhost_dev *hdev, int devfd, bool force)

int vhost_dev_init(struct vhost_dev *hdev, int devfd, const char *devpath,

                   bool force)

{

    uint64_t features;

    int r;

    if (devfd >= 0) {

        hdev->control = devfd;

    } else {

        hdev->control = open("/dev/vhost-net", O_RDWR);

        hdev->control = open(devpath, O_RDWR);

        if (hdev->control < 0) {

            return -errno;

        }