* [Qemu-devel] [PULL 1/5] hw/pcie: fix Extended Configuration Space for devices with no Extended Capabilities
2017-03-16 2:34 [Qemu-devel] [PULL 0/5] virtio, pci: fixes Michael S. Tsirkin
@ 2017-03-16 2:35 ` Michael S. Tsirkin
2017-03-16 2:35 ` [Qemu-devel] [PULL 2/5] hw/virtio: fix error enabling flags in Device Control register Michael S. Tsirkin
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Michael S. Tsirkin @ 2017-03-16 2:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Marcel Apfelbaum
From: Marcel Apfelbaum <marcel@redhat.com>
Absence of any Extended Capabilities is required to be
indicated by an Extended Capability header with a Capability ID of
0000h, a Capability Version of 0h, and a Next Capability Offset of 000h.
Instead of inserting a 'NULL' capability is simpler to mark the start
of the Extended Configuration Space as read-only to achieve the same
behaviour.
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/compat.h | 4 ++++
include/hw/pci/pci.h | 2 ++
hw/pci/pci.c | 2 ++
hw/pci/pcie.c | 6 ++++++
4 files changed, 14 insertions(+)
diff --git a/include/hw/compat.h b/include/hw/compat.h
index b7db438..ce3bfe3 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -18,6 +18,10 @@
.driver = "pci-bridge",\
.property = "shpc",\
.value = "on",\
+ },{\
+ .driver = TYPE_PCI_DEVICE,\
+ .property = "x-pcie-extcap-init",\
+ .value = "off",\
},
#define HW_COMPAT_2_7 \
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 713ede0..a37a2d5 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -183,6 +183,8 @@ enum {
/* Link active status in endpoint capability is always set */
#define QEMU_PCIE_LNKSTA_DLLLA_BITNR 8
QEMU_PCIE_LNKSTA_DLLLA = (1 << QEMU_PCIE_LNKSTA_DLLLA_BITNR),
+#define QEMU_PCIE_EXTCAP_INIT_BITNR 9
+ QEMU_PCIE_EXTCAP_INIT = (1 << QEMU_PCIE_EXTCAP_INIT_BITNR),
};
#define TYPE_PCI_DEVICE "pci-device"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index ad46390..e6b08e1 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -64,6 +64,8 @@ static Property pci_props[] = {
QEMU_PCI_CAP_SERR_BITNR, true),
DEFINE_PROP_BIT("x-pcie-lnksta-dllla", PCIDevice, cap_present,
QEMU_PCIE_LNKSTA_DLLLA_BITNR, true),
+ DEFINE_PROP_BIT("x-pcie-extcap-init", PCIDevice, cap_present,
+ QEMU_PCIE_EXTCAP_INIT_BITNR, true),
DEFINE_PROP_END_OF_LIST()
};
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index fc54bfd..82a8902 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -109,6 +109,12 @@ int pcie_cap_init(PCIDevice *dev, uint8_t offset, uint8_t type, uint8_t port)
PCI_EXP_DEVCAP2_EFF | PCI_EXP_DEVCAP2_EETLPP);
pci_set_word(dev->wmask + pos + PCI_EXP_DEVCTL2, PCI_EXP_DEVCTL2_EETLPPB);
+
+ if (dev->cap_present & QEMU_PCIE_EXTCAP_INIT) {
+ /* read-only to behave like a 'NULL' Extended Capability Header */
+ pci_set_long(dev->wmask + PCI_CONFIG_SPACE_SIZE, 0);
+ }
+
return pos;
}
--
MST
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Qemu-devel] [PULL 2/5] hw/virtio: fix error enabling flags in Device Control register
2017-03-16 2:34 [Qemu-devel] [PULL 0/5] virtio, pci: fixes Michael S. Tsirkin
2017-03-16 2:35 ` [Qemu-devel] [PULL 1/5] hw/pcie: fix Extended Configuration Space for devices with no Extended Capabilities Michael S. Tsirkin
@ 2017-03-16 2:35 ` Michael S. Tsirkin
2017-03-16 2:35 ` [Qemu-devel] [PULL 3/5] hw/virtio: fix Link Control Register for PCI Express virtio devices Michael S. Tsirkin
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Michael S. Tsirkin @ 2017-03-16 2:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Marcel Apfelbaum
From: Marcel Apfelbaum <marcel@redhat.com>
When the virtio devices are PCI Express, make error-enabling flags
writable to respect the PCIe spec.
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio-pci.h | 4 ++++
include/hw/compat.h | 4 ++++
hw/virtio/virtio-pci.c | 12 ++++++++++++
dtc | 2 +-
4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
index d00064c..120661d 100644
--- a/hw/virtio/virtio-pci.h
+++ b/hw/virtio/virtio-pci.h
@@ -73,6 +73,7 @@ enum {
VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT,
VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT,
VIRTIO_PCI_FLAG_ATS_BIT,
+ VIRTIO_PCI_FLAG_INIT_DEVERR_BIT,
};
/* Need to activate work-arounds for buggy guests at vmstate load. */
@@ -100,6 +101,9 @@ enum {
/* address space translation service */
#define VIRTIO_PCI_FLAG_ATS (1 << VIRTIO_PCI_FLAG_ATS_BIT)
+/* Init error enabling flags */
+#define VIRTIO_PCI_FLAG_INIT_DEVERR (1 << VIRTIO_PCI_FLAG_INIT_DEVERR_BIT)
+
typedef struct {
MSIMessage msg;
int virq;
diff --git a/include/hw/compat.h b/include/hw/compat.h
index ce3bfe3..c98776a 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -22,6 +22,10 @@
.driver = TYPE_PCI_DEVICE,\
.property = "x-pcie-extcap-init",\
.value = "off",\
+ },{\
+ .driver = "virtio-pci",\
+ .property = "x-pcie-deverr-init",\
+ .value = "off",\
},
#define HW_COMPAT_2_7 \
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 69cc471..f6de5ee 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1819,6 +1819,11 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
*/
pci_set_word(pci_dev->config + pos + PCI_PM_PMC, 0x3);
+ if (proxy->flags & VIRTIO_PCI_FLAG_INIT_DEVERR) {
+ /* Init error enabling flags */
+ pcie_cap_deverr_init(pci_dev);
+ }
+
if (proxy->flags & VIRTIO_PCI_FLAG_ATS) {
pcie_ats_init(pci_dev, 256);
}
@@ -1849,6 +1854,7 @@ static void virtio_pci_reset(DeviceState *qdev)
{
VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev);
VirtioBusState *bus = VIRTIO_BUS(&proxy->bus);
+ PCIDevice *dev = PCI_DEVICE(qdev);
int i;
virtio_pci_stop_ioeventfd(proxy);
@@ -1862,6 +1868,10 @@ static void virtio_pci_reset(DeviceState *qdev)
proxy->vqs[i].avail[0] = proxy->vqs[i].avail[1] = 0;
proxy->vqs[i].used[0] = proxy->vqs[i].used[1] = 0;
}
+
+ if (pci_is_express(dev)) {
+ pcie_cap_deverr_reset(dev);
+ }
}
static Property virtio_pci_properties[] = {
@@ -1882,6 +1892,8 @@ static Property virtio_pci_properties[] = {
ignore_backend_features, false),
DEFINE_PROP_BIT("ats", VirtIOPCIProxy, flags,
VIRTIO_PCI_FLAG_ATS_BIT, false),
+ DEFINE_PROP_BIT("x-pcie-deverr-init", VirtIOPCIProxy, flags,
+ VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, true),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/dtc b/dtc
index 558cd81..65cc4d2 160000
--- a/dtc
+++ b/dtc
@@ -1 +1 @@
-Subproject commit 558cd81bdd432769b59bff01240c44f82cfb1a9d
+Subproject commit 65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf
--
MST
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Qemu-devel] [PULL 3/5] hw/virtio: fix Link Control Register for PCI Express virtio devices
2017-03-16 2:34 [Qemu-devel] [PULL 0/5] virtio, pci: fixes Michael S. Tsirkin
2017-03-16 2:35 ` [Qemu-devel] [PULL 1/5] hw/pcie: fix Extended Configuration Space for devices with no Extended Capabilities Michael S. Tsirkin
2017-03-16 2:35 ` [Qemu-devel] [PULL 2/5] hw/virtio: fix error enabling flags in Device Control register Michael S. Tsirkin
@ 2017-03-16 2:35 ` Michael S. Tsirkin
2017-03-16 2:35 ` [Qemu-devel] [PULL 4/5] hw/virtio: fix Power Management " Michael S. Tsirkin
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Michael S. Tsirkin @ 2017-03-16 2:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Marcel Apfelbaum
From: Marcel Apfelbaum <marcel@redhat.com>
Make several Link Control Register flags writable to conform
with the PCI Express spec.
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio-pci.h | 4 ++++
include/hw/compat.h | 4 ++++
include/hw/pci/pcie.h | 3 +++
hw/pci/pcie.c | 14 ++++++++++++++
hw/virtio/virtio-pci.c | 8 ++++++++
5 files changed, 33 insertions(+)
diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
index 120661d..9b5dd5a 100644
--- a/hw/virtio/virtio-pci.h
+++ b/hw/virtio/virtio-pci.h
@@ -74,6 +74,7 @@ enum {
VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT,
VIRTIO_PCI_FLAG_ATS_BIT,
VIRTIO_PCI_FLAG_INIT_DEVERR_BIT,
+ VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT,
};
/* Need to activate work-arounds for buggy guests at vmstate load. */
@@ -104,6 +105,9 @@ enum {
/* Init error enabling flags */
#define VIRTIO_PCI_FLAG_INIT_DEVERR (1 << VIRTIO_PCI_FLAG_INIT_DEVERR_BIT)
+/* Init Link Control register */
+#define VIRTIO_PCI_FLAG_INIT_LNKCTL (1 << VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT)
+
typedef struct {
MSIMessage msg;
int virq;
diff --git a/include/hw/compat.h b/include/hw/compat.h
index c98776a..0931aa5 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -26,6 +26,10 @@
.driver = "virtio-pci",\
.property = "x-pcie-deverr-init",\
.value = "off",\
+ },{\
+ .driver = "virtio-pci",\
+ .property = "x-pcie-lnkctl-init",\
+ .value = "off",\
},
#define HW_COMPAT_2_7 \
diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h
index 163c519..11c6247 100644
--- a/include/hw/pci/pcie.h
+++ b/include/hw/pci/pcie.h
@@ -96,6 +96,9 @@ uint8_t pcie_cap_flags_get_vector(PCIDevice *dev);
void pcie_cap_deverr_init(PCIDevice *dev);
void pcie_cap_deverr_reset(PCIDevice *dev);
+void pcie_cap_lnkctl_init(PCIDevice *dev);
+void pcie_cap_lnkctl_reset(PCIDevice *dev);
+
void pcie_cap_slot_init(PCIDevice *dev, uint16_t slot);
void pcie_cap_slot_reset(PCIDevice *dev);
void pcie_cap_slot_write_config(PCIDevice *dev,
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index 82a8902..18e634f 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -223,6 +223,20 @@ void pcie_cap_deverr_reset(PCIDevice *dev)
PCI_EXP_DEVCTL_FERE | PCI_EXP_DEVCTL_URRE);
}
+void pcie_cap_lnkctl_init(PCIDevice *dev)
+{
+ uint32_t pos = dev->exp.exp_cap;
+ pci_long_test_and_set_mask(dev->wmask + pos + PCI_EXP_LNKCTL,
+ PCI_EXP_LNKCTL_CCC | PCI_EXP_LNKCTL_ES);
+}
+
+void pcie_cap_lnkctl_reset(PCIDevice *dev)
+{
+ uint8_t *lnkctl = dev->config + dev->exp.exp_cap + PCI_EXP_LNKCTL;
+ pci_long_test_and_clear_mask(lnkctl,
+ PCI_EXP_LNKCTL_CCC | PCI_EXP_LNKCTL_ES);
+}
+
static void hotplug_event_update_event_status(PCIDevice *dev)
{
uint32_t pos = dev->exp.exp_cap;
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index f6de5ee..300aa4a 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1824,6 +1824,11 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
pcie_cap_deverr_init(pci_dev);
}
+ if (proxy->flags & VIRTIO_PCI_FLAG_INIT_LNKCTL) {
+ /* Init Link Control Register */
+ pcie_cap_lnkctl_init(pci_dev);
+ }
+
if (proxy->flags & VIRTIO_PCI_FLAG_ATS) {
pcie_ats_init(pci_dev, 256);
}
@@ -1871,6 +1876,7 @@ static void virtio_pci_reset(DeviceState *qdev)
if (pci_is_express(dev)) {
pcie_cap_deverr_reset(dev);
+ pcie_cap_lnkctl_reset(dev);
}
}
@@ -1894,6 +1900,8 @@ static Property virtio_pci_properties[] = {
VIRTIO_PCI_FLAG_ATS_BIT, false),
DEFINE_PROP_BIT("x-pcie-deverr-init", VirtIOPCIProxy, flags,
VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, true),
+ DEFINE_PROP_BIT("x-pcie-lnkctl-init", VirtIOPCIProxy, flags,
+ VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, true),
DEFINE_PROP_END_OF_LIST(),
};
--
MST
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Qemu-devel] [PULL 4/5] hw/virtio: fix Power Management Control Register for PCI Express virtio devices
2017-03-16 2:34 [Qemu-devel] [PULL 0/5] virtio, pci: fixes Michael S. Tsirkin
` (2 preceding siblings ...)
2017-03-16 2:35 ` [Qemu-devel] [PULL 3/5] hw/virtio: fix Link Control Register for PCI Express virtio devices Michael S. Tsirkin
@ 2017-03-16 2:35 ` Michael S. Tsirkin
2017-03-16 2:35 ` [Qemu-devel] [PULL 5/5] virtio-serial-bus: Delete timer from list before free it Michael S. Tsirkin
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Michael S. Tsirkin @ 2017-03-16 2:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Marcel Apfelbaum
From: Marcel Apfelbaum <marcel@redhat.com>
Make Power Management State flag writable to conform
with the PCI Express spec.
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio-pci.h | 4 ++++
include/hw/compat.h | 4 ++++
include/hw/pci/pcie.h | 2 ++
hw/virtio/virtio-pci.c | 11 +++++++++++
4 files changed, 21 insertions(+)
diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
index 9b5dd5a..b095dfc 100644
--- a/hw/virtio/virtio-pci.h
+++ b/hw/virtio/virtio-pci.h
@@ -75,6 +75,7 @@ enum {
VIRTIO_PCI_FLAG_ATS_BIT,
VIRTIO_PCI_FLAG_INIT_DEVERR_BIT,
VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT,
+ VIRTIO_PCI_FLAG_INIT_PM_BIT,
};
/* Need to activate work-arounds for buggy guests at vmstate load. */
@@ -108,6 +109,9 @@ enum {
/* Init Link Control register */
#define VIRTIO_PCI_FLAG_INIT_LNKCTL (1 << VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT)
+/* Init Power Management */
+#define VIRTIO_PCI_FLAG_INIT_PM (1 << VIRTIO_PCI_FLAG_INIT_PM_BIT)
+
typedef struct {
MSIMessage msg;
int virq;
diff --git a/include/hw/compat.h b/include/hw/compat.h
index 0931aa5..90606f9 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -30,6 +30,10 @@
.driver = "virtio-pci",\
.property = "x-pcie-lnkctl-init",\
.value = "off",\
+ },{\
+ .driver = "virtio-pci",\
+ .property = "x-pcie-pm-init",\
+ .value = "off",\
},
#define HW_COMPAT_2_7 \
diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h
index 11c6247..3d8f24b 100644
--- a/include/hw/pci/pcie.h
+++ b/include/hw/pci/pcie.h
@@ -63,6 +63,8 @@ typedef enum {
struct PCIExpressDevice {
/* Offset of express capability in config space */
uint8_t exp_cap;
+ /* Offset of Power Management capability in config space */
+ uint8_t pm_cap;
/* SLOT */
bool hpev_notified; /* Logical AND of conditions for hot plug event.
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 300aa4a..f9b7244 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1812,6 +1812,7 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
pos = pci_add_capability(pci_dev, PCI_CAP_ID_PM, 0, PCI_PM_SIZEOF);
assert(pos > 0);
+ pci_dev->exp.pm_cap = pos;
/*
* Indicates that this function complies with revision 1.2 of the
@@ -1829,6 +1830,12 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
pcie_cap_lnkctl_init(pci_dev);
}
+ if (proxy->flags & VIRTIO_PCI_FLAG_INIT_PM) {
+ /* Init Power Management Control Register */
+ pci_set_word(pci_dev->wmask + pos + PCI_PM_CTRL,
+ PCI_PM_CTRL_STATE_MASK);
+ }
+
if (proxy->flags & VIRTIO_PCI_FLAG_ATS) {
pcie_ats_init(pci_dev, 256);
}
@@ -1877,6 +1884,8 @@ static void virtio_pci_reset(DeviceState *qdev)
if (pci_is_express(dev)) {
pcie_cap_deverr_reset(dev);
pcie_cap_lnkctl_reset(dev);
+
+ pci_set_word(dev->config + dev->exp.pm_cap + PCI_PM_CTRL, 0);
}
}
@@ -1902,6 +1911,8 @@ static Property virtio_pci_properties[] = {
VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, true),
DEFINE_PROP_BIT("x-pcie-lnkctl-init", VirtIOPCIProxy, flags,
VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, true),
+ DEFINE_PROP_BIT("x-pcie-pm-init", VirtIOPCIProxy, flags,
+ VIRTIO_PCI_FLAG_INIT_PM_BIT, true),
DEFINE_PROP_END_OF_LIST(),
};
--
MST
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Qemu-devel] [PULL 5/5] virtio-serial-bus: Delete timer from list before free it
2017-03-16 2:34 [Qemu-devel] [PULL 0/5] virtio, pci: fixes Michael S. Tsirkin
` (3 preceding siblings ...)
2017-03-16 2:35 ` [Qemu-devel] [PULL 4/5] hw/virtio: fix Power Management " Michael S. Tsirkin
@ 2017-03-16 2:35 ` Michael S. Tsirkin
2017-03-16 12:04 ` [Qemu-devel] [PULL 0/5] virtio, pci: fixes Peter Maydell
2017-03-16 14:10 ` Peter Maydell
6 siblings, 0 replies; 8+ messages in thread
From: Michael S. Tsirkin @ 2017-03-16 2:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, zhanghailiang, Paolo Bonzini, Amit Shah
From: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Amit Shah <amit@kernel.org>
---
hw/char/virtio-serial-bus.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index d544cd9..d797a67 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -724,6 +724,7 @@ static void virtio_serial_post_load_timer_cb(void *opaque)
}
}
g_free(s->post_load->connected);
+ timer_del(s->post_load->timer);
timer_free(s->post_load->timer);
g_free(s->post_load);
s->post_load = NULL;
--
MST
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PULL 0/5] virtio, pci: fixes
2017-03-16 2:34 [Qemu-devel] [PULL 0/5] virtio, pci: fixes Michael S. Tsirkin
` (4 preceding siblings ...)
2017-03-16 2:35 ` [Qemu-devel] [PULL 5/5] virtio-serial-bus: Delete timer from list before free it Michael S. Tsirkin
@ 2017-03-16 12:04 ` Peter Maydell
2017-03-16 14:10 ` Peter Maydell
6 siblings, 0 replies; 8+ messages in thread
From: Peter Maydell @ 2017-03-16 12:04 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: QEMU Developers
On 16 March 2017 at 02:34, Michael S. Tsirkin <mst@redhat.com> wrote:
> The following changes since commit 1883ff34b540daacae948f493b0ba525edf5f642:
>
> Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2017-03-15 18:44:05 +0000)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>
> for you to fetch changes up to bdf4c4ec53f293ea1baa7ce7c31fe0301887b513:
>
> virtio-serial-bus: Delete timer from list before free it (2017-03-16 01:46:42 +0200)
>
> ----------------------------------------------------------------
> virtio, pci: fixes
>
> More fixes missed in the previous pull request.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> ----------------------------------------------------------------
> Marcel Apfelbaum (4):
> hw/pcie: fix Extended Configuration Space for devices with no Extended Capabilities
> hw/virtio: fix error enabling flags in Device Control register
> hw/virtio: fix Link Control Register for PCI Express virtio devices
> hw/virtio: fix Power Management Control Register for PCI Express virtio devices
>
> zhanghailiang (1):
> virtio-serial-bus: Delete timer from list before free it
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PULL 0/5] virtio, pci: fixes
2017-03-16 2:34 [Qemu-devel] [PULL 0/5] virtio, pci: fixes Michael S. Tsirkin
` (5 preceding siblings ...)
2017-03-16 12:04 ` [Qemu-devel] [PULL 0/5] virtio, pci: fixes Peter Maydell
@ 2017-03-16 14:10 ` Peter Maydell
6 siblings, 0 replies; 8+ messages in thread
From: Peter Maydell @ 2017-03-16 14:10 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: QEMU Developers
On 16 March 2017 at 02:34, Michael S. Tsirkin <mst@redhat.com> wrote:
> The following changes since commit 1883ff34b540daacae948f493b0ba525edf5f642:
>
> Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2017-03-15 18:44:05 +0000)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>
> for you to fetch changes up to bdf4c4ec53f293ea1baa7ce7c31fe0301887b513:
>
> virtio-serial-bus: Delete timer from list before free it (2017-03-16 01:46:42 +0200)
>
> ----------------------------------------------------------------
> virtio, pci: fixes
>
> More fixes missed in the previous pull request.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> ----------------------------------------------------------------
> Marcel Apfelbaum (4):
> hw/pcie: fix Extended Configuration Space for devices with no Extended Capabilities
> hw/virtio: fix error enabling flags in Device Control register
> hw/virtio: fix Link Control Register for PCI Express virtio devices
> hw/virtio: fix Power Management Control Register for PCI Express virtio devices
>
> zhanghailiang (1):
> virtio-serial-bus: Delete timer from list before free it
>
> hw/virtio/virtio-pci.h | 12 ++++++++++++
> include/hw/compat.h | 16 ++++++++++++++++
> include/hw/pci/pci.h | 2 ++
> include/hw/pci/pcie.h | 5 +++++
> hw/char/virtio-serial-bus.c | 1 +
> hw/pci/pci.c | 2 ++
> hw/pci/pcie.c | 20 ++++++++++++++++++++
> hw/virtio/virtio-pci.c | 31 +++++++++++++++++++++++++++++++
> dtc | 2 +-
> 9 files changed, 90 insertions(+), 1 deletion(-)
This has an incorrect submodule revert in it, and I missed it before
pushing it to master :-(
This is the second pullreq from you this release cycle with a bogus
submodule change in it -- please can you fix your workflow/checks
somehow to prevent this happening?
thanks
-- PMM
^ permalink raw reply [flat|nested] 8+ messages in thread