Commit 3ee1ee80 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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



pci,virtio fixes for 1.6

This includes some last-minute bugfixes for 1.6.
All very small patches that also look very safe to me.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Mon 12 Aug 2013 04:28:57 AM CDT using RSA key ID D28D5469
# gpg: Can't check signature: public key not found

# By Michael S. Tsirkin (2) and others
# Via Michael S. Tsirkin
* mst/tags/for_anthony:
  vhost: clear signalled_used_valid on vhost stop
  virtio: clear signalled_used_valid when switching from dataplane
  i82801b11: Fix i82801b11 PCI host bridge config space
  pc: disable pci-info for 1.6

Message-id: 1376308831-19978-1-git-send-email-mst@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 6624fecd 3561ba14

hw/i386/pc_piix.c

+7 −2
Original line number Diff line number Diff line
@@ -249,12 +249,17 @@ static void pc_init_pci(QEMUMachineInitArgs *args) 
             initrd_filename, cpu_model, 1, 1);

}



static void pc_init_pci_1_5(QEMUMachineInitArgs *args)

static void pc_init_pci_1_6(QEMUMachineInitArgs *args)

{

    has_pci_info = false;

    pc_init_pci(args);

}



static void pc_init_pci_1_5(QEMUMachineInitArgs *args)

{

    pc_init_pci_1_6(args);

}



static void pc_init_pci_1_4(QEMUMachineInitArgs *args)

{

    has_pvpanic = false;
@@ -340,7 +345,7 @@ static QEMUMachine pc_i440fx_machine_v1_6 = { 
    .name = "pc-i440fx-1.6",

    .alias = "pc",

    .desc = "Standard PC (i440FX + PIIX, 1996)",

    .init = pc_init_pci,

    .init = pc_init_pci_1_6,

    .hot_add_cpu = pc_hot_add_cpu,

    .max_cpus = 255,

    .is_default = 1,

hw/i386/pc_q35.c

+7 −2
Original line number Diff line number Diff line
@@ -217,12 +217,17 @@ static void pc_q35_init(QEMUMachineInitArgs *args) 
    }

}



static void pc_q35_init_1_5(QEMUMachineInitArgs *args)

static void pc_q35_init_1_6(QEMUMachineInitArgs *args)

{

    has_pci_info = false;

    pc_q35_init(args);

}



static void pc_q35_init_1_5(QEMUMachineInitArgs *args)

{

    pc_q35_init_1_6(args);

}



static void pc_q35_init_1_4(QEMUMachineInitArgs *args)

{

    has_pvpanic = false;
@@ -234,7 +239,7 @@ static QEMUMachine pc_q35_machine_v1_6 = { 
    .name = "pc-q35-1.6",

    .alias = "q35",

    .desc = "Standard PC (Q35 + ICH9, 2009)",

    .init = pc_q35_init,

    .init = pc_q35_init_1_6,

    .hot_add_cpu = pc_hot_add_cpu,

    .max_cpus = 255,

    DEFAULT_MACHINE_OPTIONS,

hw/pci-bridge/i82801b11.c

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ static void i82801b11_bridge_class_init(ObjectClass *klass, void *data) 
    k->device_id = PCI_DEVICE_ID_INTEL_82801BA_11;

    k->revision = ICH9_D2P_A2_REVISION;

    k->init = i82801b11_bridge_initfn;

    k->config_write = pci_bridge_write_config;

    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);

}

hw/virtio/dataplane/vring.c

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ bool vring_setup(Vring *vring, VirtIODevice *vdev, int n) 
void vring_teardown(Vring *vring, VirtIODevice *vdev, int n)

{

    virtio_queue_set_last_avail_idx(vdev, n, vring->last_avail_idx);

    virtio_queue_invalidate_signalled_used(vdev, n);



    hostmem_finalize(&vring->hostmem);

}

hw/virtio/vhost.c

+1 −0
Original line number Diff line number Diff line
@@ -762,6 +762,7 @@ static void vhost_virtqueue_stop(struct vhost_dev *dev, 
        fflush(stderr);

    }

    virtio_queue_set_last_avail_idx(vdev, idx, state.num);

    virtio_queue_invalidate_signalled_used(vdev, idx);

    assert (r >= 0);

    cpu_physical_memory_unmap(vq->ring, virtio_queue_get_ring_size(vdev, idx),

                              0, virtio_queue_get_ring_size(vdev, idx));