Commit 7c9958b0 authored May 11, 2012 by Jan Kiszka Committed by Michael S. Tsirkin Jun 07, 2012

msi: Guard msi/msix_write_config with msi_present



Terminate msi/msix_write_config early if support is not enabled. This
allows to remove checks at the caller site if MSI is optional.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

parent cbd2d434

hw/msi.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -276,7 +276,8 @@ void msi_write_config(PCIDevice *dev, uint32_t addr, uint32_t val, int len)
		unsigned int vector;
		uint32_t pending;

		if (!ranges_overlap(addr, len, dev->msi_cap, msi_cap_sizeof(flags))) {
		if (!msi_present(dev) \|\|
		!ranges_overlap(addr, len, dev->msi_cap, msi_cap_sizeof(flags))) {
		return;
		}

hw/msix.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ void msix_write_config(PCIDevice *dev, uint32_t addr,
		int vector;
		bool was_masked;

		if (!range_covers_byte(addr, len, enable_pos)) {
		if (!msix_present(dev) \|\| !range_covers_byte(addr, len, enable_pos)) {
		return;
		}